p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Smack: fix a NULL dereference in wrong smack_import_entry() usage 

'commit e774ad683f ("smack: pass error code through pointers")'
made this function return proper error codes instead of NULL. Reflect that.

This is a fix for a NULL dereference introduced in
'commit 21abb1ec41 ("Smack: IPv6 host labeling")'

echo "$SOME_IPV6_ADDR \"test" > /smack/ipv6host
  (this should return EINVAL, it doesn't)
cat /smack/ipv6host
  (derefences 0x000a)

Signed-off-by: Lukasz Pawelczyk <l.pawelczyk@samsung.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
This commit is contained in:
Lukasz Pawelczyk 2015-08-25 12:39:46 +02:00 committed by Casey Schaufler
parent 049e6dde7e
commit 5f2bfe2f1d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/smack/smackfs.c
View File

@ -1501,8 +1501,8 @@ static ssize_t smk_write_net6addr(struct file *file, const char __user *buf,
*/ */
if (smack[0] != '-') { if (smack[0] != '-') {
skp = smk_import_entry(smack, 0); skp = smk_import_entry(smack, 0);
if (skp == NULL) { if (IS_ERR(skp)) {
rc = -EINVAL; rc = PTR_ERR(skp);
goto free_out; goto free_out;
} }
} else { } else {