lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 18 Jan 2017 17:08:54 +0100 From: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com> To: Boris Brezillon <boris.brezillon@...e-electrons.com>, Brian Norris <computersforpeace@...il.com>, Marek Vasut <marek.vasut@...il.com>, Cyrille Pitchen <cyrille.pitchen@...el.com>, David Woodhouse <dwmw2@...radead.org>, Richard Weinberger <richard@....at>, linux-mtd@...ts.infradead.org, linux-kernel@...r.kernel.org Cc: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com> Subject: [PATCH] mtd: spi-nor: Fix S3AN addressing calculation The page calculation under spi_nor_s3an_addr_convert() was wrong. On Default Address Mode we need to perform a divide by page_size. Fixes: 61cba34bd6c1 ("mtd: spi-nor: Add support for S3AN spi-nor devices") Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com> --- drivers/mtd/spi-nor/spi-nor.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 2a643a1bb45e..a374532068f0 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -431,11 +431,15 @@ static void spi_nor_unlock_and_unprep(struct spi_nor *nor, enum spi_nor_ops ops) */ static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr) { - unsigned int offset = addr; + unsigned int offset; + unsigned int ret; - offset %= nor->page_size; + offset = addr % nor->page_size; + ret = addr / nor->page_size; + ret <<= (nor->page_size > 512) ? 10 : 9; + ret |= offset; - return ((addr - offset) << 1) | offset; + return ret; } /* -- 2.11.0
Powered by blists - more mailing lists