From 4dfd24ed88c4d721d2b26d478b9ada86395d0554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 10 Dec 2019 11:53:23 +0100 Subject: [PATCH] blobmsg: make blobmsg_len and blobmsg_data_len return unsigned value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One usually doesn't guard against negative length values in the code. Signed-off-by: Petr Štetiar --- blobmsg.c | 3 ++- blobmsg.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/blobmsg.c b/blobmsg.c index 97e0c20..1a8b783 100644 --- a/blobmsg.c +++ b/blobmsg.c @@ -35,7 +35,8 @@ bool blobmsg_check_attr(const struct blob_attr *attr, bool name) { const struct blobmsg_hdr *hdr; const char *data; - int id, len; + size_t len; + int id; if (blob_len(attr) < sizeof(struct blobmsg_hdr)) return false; diff --git a/blobmsg.h b/blobmsg.h index b06ef59..0af0878 100644 --- a/blobmsg.h +++ b/blobmsg.h @@ -86,7 +86,7 @@ static inline void *blobmsg_data(const struct blob_attr *attr) return data; } -static inline int blobmsg_data_len(const struct blob_attr *attr) +static inline size_t blobmsg_data_len(const struct blob_attr *attr) { uint8_t *start, *end; @@ -99,7 +99,7 @@ static inline int blobmsg_data_len(const struct blob_attr *attr) return blob_len(attr) - (end - start); } -static inline int blobmsg_len(const struct blob_attr *attr) +static inline size_t blobmsg_len(const struct blob_attr *attr) { return blobmsg_data_len(attr); }