From: Lukasz Pawelczyk <l.pawelczyk@samsung.com>
To: Casey Schaufler <casey@schaufler-ca.com>,
        James Morris <james.l.morris@oracle.com>,
        "Serge E. Hallyn" <serge@hallyn.com>,
        linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: havner@gmail.com, Lukasz Pawelczyk <l.pawelczyk@samsung.com>
Subject: [PATCH] Smack: fix a NULL dereference in wrong smack_import_entry()
 usage
Date: Tue, 25 Aug 2015 12:39:46 +0200
Message-id: <1440499186-9844-1-git-send-email-l.pawelczyk@samsung.com>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1203
Lines: 39

The e774ad683f425a51f87711164ea166d9dcc41477 commit made this function
return proper error codes instead of NULL. Reflect that.

This is a fix for a NULL dereference introduced in
21abb1ec414c75abe32c3854848ff30e2b4a6113:

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>
---
 security/smack/smackfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index c20b154..103a619 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -1501,8 +1501,8 @@ static ssize_t smk_write_net6addr(struct file *file, const char __user *buf,
 	 */
 	if (smack[0] != '-') {
 		skp = smk_import_entry(smack, 0);
-		if (skp == NULL) {
-			rc = -EINVAL;
+		if (IS_ERR(skp)) {
+			rc = PTR_ERR(skp);
 			goto free_out;
 		}
 	} else {
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/