From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lance Richardson Subject: Re: [PATCH net 1/5] macsec: add missing NULL check after kmalloc Date: Tue, 19 Apr 2016 13:45:47 -0400 (EDT) Message-ID: <1625750535.15145234.1461087947312.JavaMail.zimbra@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, Hannes Frederic Sowa , Johannes Berg , Dan Carpenter To: Sabrina Dubroca Return-path: Received: from mx3-phx2.redhat.com ([209.132.183.24]:34391 "EHLO mx3-phx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753683AbcDSRp6 (ORCPT ); Tue, 19 Apr 2016 13:45:58 -0400 In-Reply-To: Sender: netdev-owner@vger.kernel.org List-ID: ----- Original Message ----- > From: "Sabrina Dubroca" > To: netdev@vger.kernel.org > Cc: "Hannes Frederic Sowa" , "Johannes Berg" , "Dan Carpenter" > , "Sabrina Dubroca" > Sent: Tuesday, April 19, 2016 1:36:38 PM > Subject: [PATCH net 1/5] macsec: add missing NULL check after kmalloc > > Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver") > Reported-by: Dan Carpenter > Signed-off-by: Sabrina Dubroca > Acked-by: Hannes Frederic Sowa > --- > drivers/net/macsec.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c > index 84d3e5ca8817..f691030ee3df 100644 > --- a/drivers/net/macsec.c > +++ b/drivers/net/macsec.c > @@ -1622,8 +1622,8 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct > genl_info *info) > } > > rx_sa = kmalloc(sizeof(*rx_sa), GFP_KERNEL); > - if (init_rx_sa(rx_sa, nla_data(tb_sa[MACSEC_SA_ATTR_KEY]), secy->key_len, > - secy->icv_len)) { > + if (!rx_sa || init_rx_sa(rx_sa, nla_data(tb_sa[MACSEC_SA_ATTR_KEY]), > + secy->key_len, secy->icv_len)) { Doesn't this leak rx_sa if kmalloc() succeeds but init_rx_sa fails? > rtnl_unlock(); > return -ENOMEM; > } > -- > 2.8.0 > >