From patchwork Wed Oct 26 09:23:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 686953 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t3l4g5m4Rz9svs for ; Wed, 26 Oct 2016 20:25:55 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bzKRe-0003wB-6P; Wed, 26 Oct 2016 09:24:26 +0000 Received: from up.free-electrons.com ([163.172.77.33] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bzKRY-0003qx-32 for linux-mtd@lists.infradead.org; Wed, 26 Oct 2016 09:24:21 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 1DC6120C56; Wed, 26 Oct 2016 11:23:56 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from bbrezillon (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id D739A2078E; Wed, 26 Oct 2016 11:23:45 +0200 (CEST) Date: Wed, 26 Oct 2016 11:23:46 +0200 From: Boris Brezillon To: Dan Carpenter Subject: Re: [bug report] UBI: Fastmap: Do not add vol if it already exists Message-ID: <20161026112346.40588a81@bbrezillon> In-Reply-To: <20161026082536.GP4418@mwanda> References: <20161025204607.GA27826@elgon.mountain> <58100B0B.3030906@huawei.com> <20161026082536.GP4418@mwanda> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161026_022420_443962_FD55AAEB X-CRM114-Status: GOOD ( 20.58 ) X-Spam-Score: -3.3 (---) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-3.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 BIGNUM_EMAILS Lots of email addresses/leads X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , linux-mtd@lists.infradead.org, Sheng Yong Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org + Richard On Wed, 26 Oct 2016 11:25:36 +0300 Dan Carpenter wrote: > On Wed, Oct 26, 2016 at 09:46:51AM +0800, Sheng Yong wrote: > > Hi Dan, > > > > On 10/26/2016 4:46 AM, Dan Carpenter wrote: > > > Hello shengyong, > > > > > > The patch e96a8a3bb671: "UBI: Fastmap: Do not add vol if it already > > > exists" from May 26, 2015, leads to the following static checker > > > warning: > > > > > > drivers/mtd/ubi/fastmap.c:712 ubi_attach_fastmap() > > > warn: PTR_ERR(av) is never (-22) > > > > > > drivers/mtd/ubi/fastmap.c > > > 703 > > > 704 av = add_vol(ai, be32_to_cpu(fmvhdr->vol_id), > > > 705 be32_to_cpu(fmvhdr->used_ebs), > > > 706 be32_to_cpu(fmvhdr->data_pad), > > > 707 fmvhdr->vol_type, > > > 708 be32_to_cpu(fmvhdr->last_eb_bytes)); > > > 709 > > > 710 if (!av) > > > 711 goto fail_bad; > > > 712 if (PTR_ERR(av) == -EINVAL) { > > > > > > av is either -EEXIST or -ENOMEM. It's never -EINVAL. > > The commit e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already exists") > > adds a "return ERR_PTR(-EINVAL);" to add_vol(). So I think av could be -EINVAL. > > You mean add_vol should return -EEXIST instead of -EINVAL? > > > > Oh, ah. I'm on linux-next. Commit de4c455b3e9f ("UBI: factorize code > used to manipulate volumes at attach time") removed the -EINVAL. > > It's really Boris to blame for this warning. I'm not sure what the fix > is. Yes, sorry, I didn't notice the caller was explicitly testing for -EINVAL. Here is a patch fixing the problem: --->8--- From 66d46bb212a8fcdcdd54def051492abb1668f1b2 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Wed, 26 Oct 2016 11:17:03 +0200 Subject: [PATCH] UBI: fastmap: Fix add_vol() return value test in ubi_attach_fastmap() Commit e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already exists") introduced a bug by changing the possible error codes returned by add_vol(): - this functions no longer returns NULL in case of allocation failure but return ERR_PTR(-ENOMEM) - when a duplicate entry in the volume RB tree is found it returns ERR_PTR(-EEXIST) instead of ERR_PTR(-EINVAL) Fix the tests done of add_vol() return value accordingly. Fixes: e96a8a3bb671 ("UBI: Fastmap: Do not add vol if it already exists") Signed-off-by: Boris Brezillon Acked-by: Sheng Yong --- drivers/mtd/ubi/fastmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index d6384d965788..eb39c44726e3 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -707,11 +707,11 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, fmvhdr->vol_type, be32_to_cpu(fmvhdr->last_eb_bytes)); - if (!av) - goto fail_bad; - if (PTR_ERR(av) == -EINVAL) { - ubi_err(ubi, "volume (ID %i) already exists", - fmvhdr->vol_id); + if (IS_ERR(av)) { + if (PTR_ERR(av) == -EEXIST) + ubi_err(ubi, "volume (ID %i) already exists", + fmvhdr->vol_id); + goto fail_bad; }