drivers/mtd/bch: fix size_t overflow when offset > 4GB

Donny9 · xiaoxiang781216 · commit c978f2fe4c7f · 2024-09-09T01:23:02.000+08:00
Signed-off-by: dongjiuzhu1 &lt;dongjiuzhu1@xiaomi.com&gt;
diff --git a/drivers/bch/bchlib_read.c b/drivers/bch/bchlib_read.c
@@ -64,7 +64,7 @@
  *
  ****************************************************************************/
 
-ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset,
+ssize_t bchlib_read(FAR void *handle, FAR char *buffer, off_t offset,
                     size_t len)
 {
   FAR struct bchlib_s *bch = (FAR struct bchlib_s *)handle;
diff --git a/drivers/bch/bchlib_write.c b/drivers/bch/bchlib_write.c
@@ -50,7 +50,7 @@
  *
  ****************************************************************************/
 
-ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset,
+ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, off_t offset,
         size_t len)
 {
   FAR struct bchlib_s *bch = (FAR struct bchlib_s *)handle;
diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c
@@ -725,7 +725,7 @@ static int mtd_loop_ioctl(FAR struct file *filep, int cmd,
  *
  ****************************************************************************/
 
-FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
+FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, off_t offset,
                                          int16_t sectsize, int32_t erasesize)
 {
   FAR struct file_dev_s *priv;
diff --git a/include/nuttx/drivers/drivers.h b/include/nuttx/drivers/drivers.h
@@ -231,7 +231,7 @@ int bchlib_teardown(FAR void *handle);
  *
  ****************************************************************************/
 
-ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset,
+ssize_t bchlib_read(FAR void *handle, FAR char *buffer, off_t offset,
                     size_t len);
 
 /****************************************************************************
@@ -243,7 +243,7 @@ ssize_t bchlib_read(FAR void *handle, FAR char *buffer, size_t offset,
  *
  ****************************************************************************/
 
-ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, size_t offset,
+ssize_t bchlib_write(FAR void *handle, FAR const char *buffer, off_t offset,
                      size_t len);
 
 /****************************************************************************
diff --git a/include/nuttx/mtd/mtd.h b/include/nuttx/mtd/mtd.h
@@ -657,7 +657,7 @@ FAR struct mtd_dev_s *w25qxxxjv_initialize(FAR struct qspi_dev_s *qspi,
  *
  ****************************************************************************/
 
-FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
+FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, off_t offset,
                                          int16_t sectsize,
                                          int32_t erasesize);
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`*`
`65`	`65`	`****************************************************************************/`
`66`	`66`
`67`		`-ssize_t bchlib_read(FAR void handle, FAR char buffer, size_t offset,`
	`67`	`+ssize_t bchlib_read(FAR void handle, FAR char buffer, off_t offset,`
`68`	`68`	`size_t len)`
`69`	`69`	`{`
`70`	`70`	`FAR struct bchlib_s bch = (FAR struct bchlib_s )handle;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`*`
`51`	`51`	`****************************************************************************/`
`52`	`52`
`53`		`-ssize_t bchlib_write(FAR void handle, FAR const char buffer, size_t offset,`
	`53`	`+ssize_t bchlib_write(FAR void handle, FAR const char buffer, off_t offset,`
`54`	`54`	`size_t len)`
`55`	`55`	`{`
`56`	`56`	`FAR struct bchlib_s bch = (FAR struct bchlib_s )handle;`
Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ static int mtd_loop_ioctl(FAR struct file *filep, int cmd,`
`725`	`725`	`*`
`726`	`726`	`****************************************************************************/`
`727`	`727`
`728`		`-FAR struct mtd_dev_s filemtd_initialize(FAR const char path, size_t offset,`
	`728`	`+FAR struct mtd_dev_s filemtd_initialize(FAR const char path, off_t offset,`
`729`	`729`	`int16_t sectsize, int32_t erasesize)`
`730`	`730`	`{`
`731`	`731`	`FAR struct file_dev_s *priv;`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ int bchlib_teardown(FAR void *handle);`
`231`	`231`	`*`
`232`	`232`	`****************************************************************************/`
`233`	`233`
`234`		`-ssize_t bchlib_read(FAR void handle, FAR char buffer, size_t offset,`
	`234`	`+ssize_t bchlib_read(FAR void handle, FAR char buffer, off_t offset,`
`235`	`235`	`size_t len);`
`236`	`236`
`237`	`237`	`/****************************************************************************`
`@@ -243,7 +243,7 @@ ssize_t bchlib_read(FAR void handle, FAR char buffer, size_t offset,`
`243`	`243`	`*`
`244`	`244`	`****************************************************************************/`
`245`	`245`
`246`		`-ssize_t bchlib_write(FAR void handle, FAR const char buffer, size_t offset,`
	`246`	`+ssize_t bchlib_write(FAR void handle, FAR const char buffer, off_t offset,`
`247`	`247`	`size_t len);`
`248`	`248`
`249`	`249`	`/****************************************************************************`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ FAR struct mtd_dev_s w25qxxxjv_initialize(FAR struct qspi_dev_s qspi,`
`657`	`657`	`*`
`658`	`658`	`****************************************************************************/`
`659`	`659`
`660`		`-FAR struct mtd_dev_s filemtd_initialize(FAR const char path, size_t offset,`
	`660`	`+FAR struct mtd_dev_s filemtd_initialize(FAR const char path, off_t offset,`
`661`	`661`	`int16_t sectsize,`
`662`	`662`	`int32_t erasesize);`
`663`	`663`