Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

apparmor: fix '*seclen' is never less than zero

smatch warnings:
security/apparmor/secid.c:162 apparmor_secid_to_secctx() warn: unsigned '*seclen' is never less than zero.

vim +162 security/apparmor/secid.c

140
141 int apparmor_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)
142 {
143 /* TODO: cache secctx and ref count so we don't have to recreate */
144 struct aa_label *label = aa_secid_to_label(secid);
145
146 AA_BUG(!secdata);
147 AA_BUG(!seclen);
148
149 if (!label)
150 return -EINVAL;
151
152 if (secdata)
153 *seclen = aa_label_asxprint(secdata, root_ns, label,
154 FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
155 FLAG_HIDDEN_UNCONFINED |
156 FLAG_ABS_ROOT, GFP_ATOMIC);
157 else
158 *seclen = aa_label_snxprint(NULL, 0, root_ns, label,
159 FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
160 FLAG_HIDDEN_UNCONFINED |
161 FLAG_ABS_ROOT);
> 162 if (*seclen < 0)
163 return -ENOMEM;
164
165 return 0;
166 }
167

Fixes: c092921219d2 ("apparmor: add support for mapping secids and using secctxes")
Signed-off-by: John Johansen <john.johansen@canonical.com>

+11 -9
+11 -9
security/apparmor/secid.c
··· 142 142 { 143 143 /* TODO: cache secctx and ref count so we don't have to recreate */ 144 144 struct aa_label *label = aa_secid_to_label(secid); 145 + int len; 145 146 146 147 AA_BUG(!secdata); 147 148 AA_BUG(!seclen); ··· 151 150 return -EINVAL; 152 151 153 152 if (secdata) 154 - *seclen = aa_label_asxprint(secdata, root_ns, label, 155 - FLAG_SHOW_MODE | FLAG_VIEW_SUBNS | 156 - FLAG_HIDDEN_UNCONFINED | 157 - FLAG_ABS_ROOT, GFP_ATOMIC); 153 + len = aa_label_asxprint(secdata, root_ns, label, 154 + FLAG_SHOW_MODE | FLAG_VIEW_SUBNS | 155 + FLAG_HIDDEN_UNCONFINED | FLAG_ABS_ROOT, 156 + GFP_ATOMIC); 158 157 else 159 - *seclen = aa_label_snxprint(NULL, 0, root_ns, label, 160 - FLAG_SHOW_MODE | FLAG_VIEW_SUBNS | 161 - FLAG_HIDDEN_UNCONFINED | 162 - FLAG_ABS_ROOT); 163 - if (*seclen < 0) 158 + len = aa_label_snxprint(NULL, 0, root_ns, label, 159 + FLAG_SHOW_MODE | FLAG_VIEW_SUBNS | 160 + FLAG_HIDDEN_UNCONFINED | FLAG_ABS_ROOT); 161 + if (len < 0) 164 162 return -ENOMEM; 163 + 164 + *seclen = len; 165 165 166 166 return 0; 167 167 }