public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Brian Norris <computersforpeace@gmail.com>
To: <linux-mtd@lists.infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>,
	<linux-kernel@vger.kernel.org>,
	kernel-janitors@vger.kernel.org
Subject: [PATCH 4/7] mtd: nand: fixup bounds checks for nand_{lock,unlock}()
Date: Sat, 28 Feb 2015 02:02:27 -0800	[thread overview]
Message-ID: <1425117750-22298-5-git-send-email-computersforpeace@gmail.com> (raw)
In-Reply-To: <1425117750-22298-1-git-send-email-computersforpeace@gmail.com>

Coverity noticed that these 'ret' assignments weren't being used. Let's
use them.

Note that nand_lock() and nand_unlock() are still not officially used by
any drivers.

Coverity CIDs #1227054 and #1227037

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 drivers/mtd/nand/nand_base.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index df7eb4ff07d1..5488a7ad63e7 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -968,7 +968,7 @@ int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 			__func__, (unsigned long long)ofs, len);
 
 	if (check_offs_len(mtd, ofs, len))
-		ret = -EINVAL;
+		return -EINVAL;
 
 	/* Align to last block address if size addresses end of the device */
 	if (ofs + len == mtd->size)
@@ -1031,7 +1031,7 @@ int nand_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 			__func__, (unsigned long long)ofs, len);
 
 	if (check_offs_len(mtd, ofs, len))
-		ret = -EINVAL;
+		return -EINVAL;
 
 	nand_get_device(mtd, FL_LOCKING);
 
-- 
2.1.0


  parent reply	other threads:[~2015-02-28 10:04 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-28 10:02 [PATCH 0/7] mtd: various fixes caught by Coverity Brian Norris
2015-02-28 10:02 ` [PATCH 1/7] mtd: docg3: drop dead code Brian Norris
2015-03-02  9:10   ` Dan Carpenter
2015-03-02 21:39     ` Robert Jarzmik
2015-03-09 17:18   ` [PATCH v2 " Brian Norris
2015-02-28 10:02 ` [PATCH 2/7] mtd: onenand: " Brian Norris
2015-02-28 10:02 ` [PATCH 3/7] mtd: tests: fix more potential integer overflows Brian Norris
2015-02-28 10:02 ` Brian Norris [this message]
2015-02-28 10:02 ` [PATCH 5/7] mtd: nand: denali: drop dead code Brian Norris
2015-02-28 10:02 ` [PATCH 6/7] mtd: blkdevs: remove " Brian Norris
2015-02-28 10:02 ` [PATCH 7/7] mtd: nand: fully initialize mtd_oob_ops Brian Norris
2015-03-11 23:46 ` [PATCH 0/7] mtd: various fixes caught by Coverity Brian Norris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1425117750-22298-5-git-send-email-computersforpeace@gmail.com \
    --to=computersforpeace@gmail.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox