From patchwork Fri May 30 00:28:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 4268061 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6D69E9F30B for ; Fri, 30 May 2014 00:28:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B67E2035E for ; Fri, 30 May 2014 00:28:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A43D2035D for ; Fri, 30 May 2014 00:28:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751919AbaE3A2U (ORCPT ); Thu, 29 May 2014 20:28:20 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:65475 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751809AbaE3A2U (ORCPT ); Thu, 29 May 2014 20:28:20 -0400 Received: by mail-ie0-f180.google.com with SMTP id tp5so1097163ieb.11 for ; Thu, 29 May 2014 17:28:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:organization:content-type:mime-version :content-transfer-encoding; bh=jAC0oQ7yZJDpv5sy7ziAyMA7HI8Ne2ipbiRa9XJB8sE=; b=FBYyWVDSfz3u9/7xl7p78vevf0QjwvmuYkK0evp6J73wcrnxbSt7ZkblwzMhznr3tI +NRwrVWGa5sfHSL0MYOL/ImVZFoQb8oGcuUtiqx4SQ1uQSG/Y2TCamSh1Oq3TVxSrNYD WMWyEfelwrMSdkjdaq8oiQGVqcXjvFqFaHDTKBDxF23kP1ZRbXj/A12O4bmWktL2dWwQ PbLyvWwIyRTZ+ra7/pyKl0KTd7KcZQ69ZlbJjBhPQ8fxiRmJWeniEhEke/26RLvfokeG KPteWrYMYGKJebrJTGAu7bYJqF+B4M58Tk4YilgsLgqjzpvqdHVZVg6mQzjAYjZSyY7d rwpw== X-Gm-Message-State: ALoCoQmxeL7eVL93r2uVZnLZKzJy9O0NIxClJz1aeDOSik/lAkymByalE9guiUKaAwjJ9uoEtYUI X-Received: by 10.50.118.69 with SMTP id kk5mr1110101igb.10.1401409699546; Thu, 29 May 2014 17:28:19 -0700 (PDT) Received: from [172.16.74.153] (c-98-209-19-95.hsd1.mi.comcast.net. [98.209.19.95]) by mx.google.com with ESMTPSA id ql7sm1277568igc.19.2014.05.29.17.28.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 29 May 2014 17:28:18 -0700 (PDT) Message-ID: <1401409695.7587.3.camel@leira.trondhjem.org> Subject: Re: [nfs:testing 48/48] fs/nfs/filelayout/filelayout.c:1351 filelayout_alloc_layout_hdr() error: potential null dereference 'flo'. (kzalloc returns null) From: Trond Myklebust To: Thomas Haynes Cc: Linux NFS Mailing List Date: Thu, 29 May 2014 20:28:15 -0400 In-Reply-To: <5387ad28.m0xKsvjghVV/maKQ%fengguang.wu@intel.com> References: <5387ad28.m0xKsvjghVV/maKQ%fengguang.wu@intel.com> Organization: PrimaryData Inc X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, 2014-05-30 at 05:56 +0800, kbuild test robot wrote: > tree: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git testing > head: a27d2ba9829d092f64076231629ba9bd576facbf > commit: a27d2ba9829d092f64076231629ba9bd576facbf [48/48] Push the file layout driver into a subdirectory > > fs/nfs/filelayout/filelayout.c:1351 filelayout_alloc_layout_hdr() error: potential null dereference 'flo'. (kzalloc returns null) > > vim +/flo +1351 fs/nfs/filelayout/filelayout.c > Hi Tom, Looks like your rename unearthed an old skeleton from the closet. I'm applying the following patch before yours in order to fix it. Cheers Trond 8<------------------------------------------------ From 6df200f5d5191bdde4d2e408215383890f956781 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Thu, 29 May 2014 20:06:55 -0400 Subject: [PATCH 1/2] pNFS: Handle allocation errors correctly in filelayout_alloc_layout_hdr() Return the NULL pointer when the allocation fails. Reported-by: Fengguang Wu Cc: # 3.5.x Signed-off-by: Trond Myklebust --- fs/nfs/nfs4filelayout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 63a16375660a..21e921147d21 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -1348,7 +1348,7 @@ filelayout_alloc_layout_hdr(struct inode *inode, gfp_t gfp_flags) struct nfs4_filelayout *flo; flo = kzalloc(sizeof(*flo), gfp_flags); - return &flo->generic_hdr; + return flo != NULL ? &flo->generic_hdr : NULL; } static void