From patchwork Mon Jul 8 07:52:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Zheng X-Patchwork-Id: 2836836 Return-Path: X-Original-To: patchwork-ocfs2-devel@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 EB6369F7D6 for ; Thu, 1 Aug 2013 07:28:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 04D9020273 for ; Thu, 1 Aug 2013 07:28:20 +0000 (UTC) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E63D20266 for ; Thu, 1 Aug 2013 07:28:18 +0000 (UTC) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r717S3mA026882 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 1 Aug 2013 07:28:04 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r717S1Sv004116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 1 Aug 2013 07:28:02 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1V4nIn-0005jZ-Rg; Thu, 01 Aug 2013 00:28:01 -0700 Received: from acsinet22.oracle.com ([141.146.126.238]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1Uw6J6-00050t-NT for ocfs2-devel@oss.oracle.com; Mon, 08 Jul 2013 00:56:24 -0700 Received: from aserp1030.oracle.com (aserp1030.oracle.com [141.146.126.68]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r687uMYi011392 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 8 Jul 2013 07:56:23 GMT Received: from song.cn.fujitsu.com (cn.fujitsu.com [222.73.24.84] (may be forged)) by aserp1030.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r687uK5x002339 for ; Mon, 8 Jul 2013 07:56:22 GMT X-IronPort-AV: E=Sophos;i="4.87,1018,1363104000"; d="scan'208";a="7817992" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 08 Jul 2013 15:53:22 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r687uBjh026806; Mon, 8 Jul 2013 15:56:12 +0800 Received: from [10.167.233.218] ([10.167.233.218]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013070815543597-2767762 ; Mon, 8 Jul 2013 15:54:35 +0800 Message-ID: <51DA6FD5.8050300@cn.fujitsu.com> Date: Mon, 08 Jul 2013 15:52:53 +0800 From: Gu Zheng User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0.1) Gecko/20110930 Thunderbird/7.0.1 MIME-Version: 1.0 To: mfasheh@suse.com, jlbec@evilplan.org X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/08 15:54:36, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/08 15:54:43, Serialize complete at 2013/07/08 15:54:43 X-Flow-Control-Info: class=Pass-to-MM reputation=ipRisk-All ip=222.73.24.84 ct-class=T2 ct-vol1=0 ct-vol2=3 ct-vol3=3 ct-risk=54 ct-spam1=67 ct-spam2=0 ct-bulk=93 rcpts=1 size=822 X-Sendmail-CM-Score: 0.00% X-Sendmail-CM-Analysis: v=2.1 cv=JqnI8qIC c=1 sm=1 tr=0 a=8891PawWEbLFDn5KpxQBoA==:117 a=8891PawWEbLFDn5KpxQBoA==:17 a=0vIRL2eIJ80A:10 a=9wzz7ISPh_QA:10 a=eRdyabIP3JcA:10 a=BLceEmwcHowA:10 a=8nJEP1OIZ-IA:10 a=omOdbC7AAAAA:8 a=Q-ZfnUYYtFIA:10 a=VtqYNE0rj4doXuP87 6wA:9 a=wPNLvfGTeEIA:10 X-Sendmail-CT-Classification: not spam X-Sendmail-CT-RefID: str=0001.0A090206.51DA70A6.0106:SCFSTAT10627299, ss=1, re=-4.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-Mailman-Approved-At: Thu, 01 Aug 2013 00:27:57 -0700 Cc: linux-kernel , ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH] ocfs2/refcounttree: add the missing NULL check of the return value of find_or_create_page() X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Add the missing NULL check of the return value of find_or_create_page() in function ocfs2_duplicate_clusters_by_page(). Signed-off-by: Gu Zheng --- fs/ocfs2/refcounttree.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c index 998b17e..456d0e4 100644 --- a/fs/ocfs2/refcounttree.c +++ b/fs/ocfs2/refcounttree.c @@ -2965,7 +2965,11 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, to = map_end & (PAGE_CACHE_SIZE - 1); page = find_or_create_page(mapping, page_index, GFP_NOFS); - + if (!page) { + ret = -ENOMEM; + mlog_errno(ret); + break; + } /* * In case PAGE_CACHE_SIZE <= CLUSTER_SIZE, This page * can't be dirtied before we CoW it out.