Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751469AbZG3OiA (ORCPT ); Thu, 30 Jul 2009 10:38:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750997AbZG3Oh7 (ORCPT ); Thu, 30 Jul 2009 10:37:59 -0400 Received: from g4t0016.houston.hp.com ([15.201.24.19]:35045 "EHLO g4t0016.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbZG3Oh6 (ORCPT ); Thu, 30 Jul 2009 10:37:58 -0400 From: Paul Moore Organization: Hewlett-Packard To: Julia Lawall Subject: Re: [PATCH 4/5] net/netlabel: Add kmalloc NULL tests Date: Thu, 30 Jul 2009 10:37:56 -0400 User-Agent: KMail/1.11.4 (Linux/2.6.30-gentoo-r1; KDE/4.2.4; i686; ; ) Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org References: <200907301032.20318.paul.moore@hp.com> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200907301037.56146.paul.moore@hp.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1570 Lines: 49 On Thursday 30 July 2009 10:36:47 am Julia Lawall wrote: > On Thu, 30 Jul 2009, Paul Moore wrote: > > On Thursday 30 July 2009 10:10:54 am Julia Lawall wrote: > > > From: Julia Lawall > > > > > > The test on map4 should be a test on map6. > > > > ... > > > > > Signed-off-by: Julia Lawall > > > > > > --- > > > net/netlabel/netlabel_kapi.c | 2 +- > > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > > > diff --git a/net/netlabel/netlabel_kapi.c > > > b/net/netlabel/netlabel_kapi.c index 3ff6f32..6ce0020 100644 > > > --- a/net/netlabel/netlabel_kapi.c > > > +++ b/net/netlabel/netlabel_kapi.c > > > @@ -151,7 +151,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain, > > > addr6 = addr; > > > mask6 = mask; > > > map6 = kzalloc(sizeof(*map6), GFP_ATOMIC); > > > - if (map4 == NULL) > > > + if (!map6) > > > goto cfg_unlbl_map_add_failure; > > > map6->type = NETLBL_NLTYPE_UNLABELED; > > > ipv6_addr_copy(&map6->list.addr, addr6); > > > > Another good find, although I would suggest changing it to the following > > to stay consistent with the rest of the function: > > > > map6 = kzalloc(...); > > if (map6 == NULL) > > goto ...; > > OK, I hesitated... I'll send a new patch shortly. Great, thank you. -- paul moore linux @ hp -- 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/