From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757703AbbJIWSm (ORCPT ); Fri, 9 Oct 2015 18:18:42 -0400 Received: from smtp106.biz.mail.bf1.yahoo.com ([98.139.244.54]:20115 "EHLO smtp106.biz.mail.bf1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757664AbbJIWSl (ORCPT ); Fri, 9 Oct 2015 18:18:41 -0400 X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: SDuUnA4VM1kOvXEmB511POyRxlBJ1Ag72P_A8ochtxRm_Tc aXdMsHazlF5__E88gzpyijqfa2P4_P56JD27j6IG4IpIBcqci6jPSD4LYmY6 Jhw9Q05pA7wt5chnxCngc4CVunx2MbE44VFAzZqWzVjm95sEctYKAz_NB_cF ZsiehIt7.hsaIAbiGmT4ZuP_YtotKquu2OZIBSmQ5er_AaUSidJOJfY57CJ0 q.EoOLoMQz6Or0zxMw.E3ocoLs.uQIEtqYvuGHF067DnSf2UF_1OJ6zo45tH oiHgOsz.7iiBycLOfNp7n67FQIJE2bUzloxk3MnilZ6ZS3Gjj2G0REieSWnU fHWOoyl0wVlsEFtbsbzU7t3D6sZwiKVgcWhtoRFfGo_1fOqGv2ssNk7jJTea QFZCwFFM8.mPsDvzsZYZ6PwQ516A1FUZXZVhE8e7_7.qe3.Il5XMBD2Ko_bl .5weXINAk3VcMs2GI8KRK3F71vwq9x.CvHkozBKoqAOofgV1OzVxi5aIZGlz sB59L6FNkkrRjpFLPS57QyrGHmv_tQ_usjdB2 X-Yahoo-SMTP: OIJXglSswBDfgLtXluJ6wiAYv6_cnw-- Subject: Re: [PATCH] Smack: fix a NULL dereference in wrong smack_import_entry() usage To: Lukasz Pawelczyk , James Morris , "Serge E. Hallyn" , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org References: <1440499186-9844-1-git-send-email-l.pawelczyk@samsung.com> Cc: havner@gmail.com From: Casey Schaufler Message-ID: <56183D61.8000007@schaufler-ca.com> Date: Fri, 9 Oct 2015 15:19:13 -0700 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1440499186-9844-1-git-send-email-l.pawelczyk@samsung.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/25/2015 3:39 AM, Lukasz Pawelczyk wrote: > 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 Acked-by: Casey Schaufler Applied to https://github.com/cschaufler/smack-next.git#smack-for-4.4 > --- > 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 {