summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2019-10-30 21:48:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-17 19:47:11 +0100
commit8dbdf414cd962176b0d6d7a20d21c79772a99d5f (patch)
tree078356032a423f75f12972b916669729b1820f06
parent70001d927817454eecd0514efa0c3702096a3b1a (diff)
downloadlinux-stable-8dbdf414cd962176b0d6d7a20d21c79772a99d5f.tar.gz
linux-stable-8dbdf414cd962176b0d6d7a20d21c79772a99d5f.tar.bz2
linux-stable-8dbdf414cd962176b0d6d7a20d21c79772a99d5f.zip
mtd: spi-nor: fix silent truncation in spi_nor_read()
commit a719a75a7761e4139dd099330d9fe3589d844f9b upstream. spi_nor_read() assigns the result of 'ssize_t spi_nor_read_data()' to the 'int ret' variable, while 'ssize_t' is a 64-bit type and *int* is a 32-bit type on the 64-bit machines. This silent truncation isn't really valid, so fix up the variable's type. Fixes: 59451e1233bd ("mtd: spi-nor: change return value of read/write") Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mtd/spi-nor/spi-nor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 2e183425facd..d1c91f0b864c 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1294,7 +1294,7 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf)
{
struct spi_nor *nor = mtd_to_spi_nor(mtd);
- int ret;
+ ssize_t ret;
dev_dbg(nor->dev, "from 0x%08x, len %zd\n", (u32)from, len);