Fix integer overflow in filesystem stat implementation. Resolve #409. (#129)

geza-pycom · amotl · web-flow · commit b74db42625e1 · 2020-06-10T09:50:29.000+02:00
Co-authored-by: Andreas Motl &lt;andreas@hiveeyes.org&gt;
diff --git a/esp32/littlefs/vfs_littlefs.c b/esp32/littlefs/vfs_littlefs.c
@@ -669,9 +669,9 @@ STATIC mp_obj_t littlefs_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_param) {
     else {
         t->items[6] = mp_obj_new_int_from_uint(0); // st_size
     }
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(seconds); // st_atime
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(seconds); // st_mtime
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(seconds); // st_ctime
+    t->items[7] = mp_obj_new_int_from_uint(seconds); // st_atime
+    t->items[8] = mp_obj_new_int_from_uint(seconds); // st_mtime
+    t->items[9] = mp_obj_new_int_from_uint(seconds); // st_ctime
 
     return MP_OBJ_FROM_PTR(t);
 }
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
@@ -365,9 +365,9 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
     t->items[4] = MP_OBJ_NEW_SMALL_INT(0); // st_uid
     t->items[5] = MP_OBJ_NEW_SMALL_INT(0); // st_gid
     t->items[6] = mp_obj_new_int_from_uint(fno.fsize); // st_size
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(seconds); // st_atime
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(seconds); // st_mtime
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(seconds); // st_ctime
+    t->items[7] = mp_obj_new_int_from_uint(seconds); // st_atime
+    t->items[8] = mp_obj_new_int_from_uint(seconds); // st_mtime
+    t->items[9] = mp_obj_new_int_from_uint(seconds); // st_ctime
 
     return MP_OBJ_FROM_PTR(t);
 }

Original file line number	Diff line number	Diff line change
`@@ -669,9 +669,9 @@ STATIC mp_obj_t littlefs_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_param) {`
`669`	`669`	`else {`
`670`	`670`	`t->items[6] = mp_obj_new_int_from_uint(0); // st_size`
`671`	`671`	`}`
`672`		`- t->items[7] = MP_OBJ_NEW_SMALL_INT(seconds); // st_atime`
`673`		`- t->items[8] = MP_OBJ_NEW_SMALL_INT(seconds); // st_mtime`
`674`		`- t->items[9] = MP_OBJ_NEW_SMALL_INT(seconds); // st_ctime`
	`672`	`+ t->items[7] = mp_obj_new_int_from_uint(seconds); // st_atime`
	`673`	`+ t->items[8] = mp_obj_new_int_from_uint(seconds); // st_mtime`
	`674`	`+ t->items[9] = mp_obj_new_int_from_uint(seconds); // st_ctime`
`675`	`675`
`676`	`676`	`return MP_OBJ_FROM_PTR(t);`
`677`	`677`	`}`