apparmor: fix unsigned len comparison with less than zero

BugLink: https://bugs.launchpad.net/bugs/1858429
[ Upstream commit 00e0590dbaec6f1bcaa36a85467d7e3497ced522 ]

The sanity check in macro update_for_len checks to see if len
is less than zero, however, len is a size_t so it can never be
less than zero, so this sanity check is a no-op.  Fix this by
making len a ssize_t so the comparison will work and add ulen
that is a size_t copy of len so that the min() macro won't
throw warnings about comparing different types.

Addresses-Coverity: ("Macro compares unsigned to 0")
Fixes: f1bd904175e8 ("apparmor: add the base fns() for domain labels")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index d94cf3d10877dba0d591ef4f9abdea347ddd32c0..b32b7c368d20239e542e1030efdb6544fc0c50ad 100644 (file)
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -1492,11 +1492,13 @@ static inline bool use_label_hname(struct aa_ns *ns, struct aa_label *label,
 /* helper macro for snprint routines */
 #define update_for_len(total, len, size, str)  \
 do {                                   \
+       size_t ulen = len;              \
+                                       \
        AA_BUG(len < 0);                \
-       total += len;                   \
-       len = min(len, size);           \
-       size -= len;                    \
-       str += len;                     \
+       total += ulen;                  \
+       ulen = min(ulen, size);         \
+       size -= ulen;                   \
+       str += ulen;                    \
 } while (0)
 
 /**
@@ -1631,7 +1633,7 @@ int aa_label_snxprint(char *str, size_t size, struct aa_ns *ns,
        struct aa_ns *prev_ns = NULL;
        struct label_it i;
        int count = 0, total = 0;
-       size_t len;
+       ssize_t len;
 
        AA_BUG(!str && size != 0);
        AA_BUG(!label);