From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932153AbdBIQvf (ORCPT ); Thu, 9 Feb 2017 11:51:35 -0500 Received: from nm3-vm6.bullet.mail.ne1.yahoo.com ([98.138.91.96]:52074 "EHLO nm3-vm6.bullet.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751949AbdBIQve (ORCPT ); Thu, 9 Feb 2017 11:51:34 -0500 X-Yahoo-Newman-Id: 729502.5946.bm@smtp218.mail.ne1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: SKKH220VM1mjUb43BgAmQpmS_vhze5mBPs6C9R052dCCGTk 1KpdOFU0x8R.WVXADea0z3g_OUUIkRvAEFhR02X3LPFO1lQZU.pz3_kyaurf rAAv8jjqEGnFaEP6YOFL9WtZcuFktHdeiaegxYAxj8P5X3hjPPJ0rMB7MgkP zDk4VjP2g.8Ce4CPKond2IR5RIobtnJNUcP4.19ElRaBBr8YzqDCwFGDQyyk W5udoNRxs7NwNgi78kyM2gS4FOaGxMOJovN.6t11B4eB.gUQ_pspWD7bltin V9to6stOfWKoGWaKtctjpRbU5gQXfC613V7jtKM3BURzNkscEtm9LQvXmIA6 R63Syi5Yj2fVakXogc0d4fn1JNl7.tRAyfvzYZX_Mso3XX5M3KbXGUB2L6u7 eQp4StTFaiIRdtnXjLuOYK08cGv5ngC9khStaJw_wunH3xds4ihs8UIux0oy PuoXfrHrtwnEJt6bsPQCzt0jcesCJx1uQnMhiuSat41MXKXzHEztke2MVVbY CQCpZ0v2A.RhDTsHWg5lSs8llaOCRewRDRfElmnsR.6OZMD2m5VA- X-Yahoo-SMTP: OIJXglSswBDfgLtXluJ6wiAYv6_cnw-- Subject: Re: [PATCH] Smack: fix a dereference before null check on sock->sk To: wharms@bfs.de, Colin King References: <20170209120301.28152-1-colin.king@canonical.com> <589C69F7.8030603@bfs.de> Cc: James Morris , "Serge E . Hallyn" , linux-security-module@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org From: Casey Schaufler Message-ID: <0a440cef-38f0-cc11-66e6-b333b49fa82f@schaufler-ca.com> Date: Thu, 9 Feb 2017 08:49:53 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <589C69F7.8030603@bfs.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/9/2017 5:09 AM, walter harms wrote: > > Am 09.02.2017 13:03, schrieb Colin King: >> From: Colin Ian King >> >> The initialisation of pointer ssp is from a dereference on sock->sk >> before sock-sk is null checked, hence there is a potential for a >> null pointer deference. Fix this by moving the assignment of ssp >> to just before it is used in the call to smk_ipv6_check. >> >> Detected with CoverityScan, CID#1324196 ("Dereference before null check") >> >> Signed-off-by: Colin Ian King >> --- >> security/smack/smack_lsm.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c >> index fc8fb31..bb17387 100644 >> --- a/security/smack/smack_lsm.c >> +++ b/security/smack/smack_lsm.c >> @@ -2899,7 +2899,7 @@ static int smack_socket_connect(struct socket *sock, struct sockaddr *sap, >> #endif >> #ifdef SMACK_IPV6_SECMARK_LABELING >> struct smack_known *rsp; >> - struct socket_smack *ssp = sock->sk->sk_security; >> + struct socket_smack *ssp; >> #endif >> >> if (sock->sk == NULL) >> @@ -2916,9 +2916,11 @@ static int smack_socket_connect(struct socket *sock, struct sockaddr *sap, >> return -EINVAL; >> #ifdef SMACK_IPV6_SECMARK_LABELING >> rsp = smack_ipv6host_label(sip); >> - if (rsp != NULL) >> + if (rsp != NULL) { >> + ssp = sock->sk->sk_security; >> rc = smk_ipv6_check(ssp->smk_out, rsp, sip, >> SMK_CONNECTING); >> + } >> #endif >> #ifdef SMACK_IPV6_PORT_LABELING >> rc = smk_ipv6_port_check(sock->sk, sip, SMK_CONNECTING); > > In the hope of reducing the ifdef forrest: > you could move the struct smack_known *rsp; and struct socket_smack *ssp; into the block like: > > { > struct smack_known *rsp=smack_ipv6host_label(sip); > > if (rsp != NULL) { > struct socket_smack *ssp= sock->sk->sk_security; > rc = smk_ipv6_check(ssp->smk_out, rsp, sip, > SMK_CONNECTING); > } > } > > > just my 2 cents ... I can't say that I'm proud of that chunk of code. A real clean-up is on my todo list, and I would happily entertain patches. > > re, > wh >