diff mbox

[U-Boot,1/2] fs/fat/fatwrite: Local variable as buffer to store dir_slot entries

Message ID 1469686136-30713-1-git-send-email-tfchee@altera.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Tien Fong Chee July 28, 2016, 6:08 a.m. UTC 
fill_dir_slot use get_contents_vfatname_block as a temporary buffer for
constructing a list of dir_slot entries. To save the memory and providing
correct type of memory for above usage, a local buffer with accurate size
declaration is introduced.

The local array size 640 is used because for long file name entry,
each entry use 32 bytes, one entry can store up to 13 characters.
The maximum number of entry possible is 20. So, total size is
32*20=640bytes.

Signed-off-by: Genevieve Chan <ccheauya@altera.com>
Signed-off-by: Tien Fong Chee <tfchee@altera.com>
---
Changes for V2
- Removed extra space
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: ChinLiang <clsee@altera.com>
Cc: Vagrant Cascadian <vagrant@debian.org>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Benoît Thébaudeau <benoit@wsystem.com>
---
 fs/fat/fat_write.c | 3 ++-
 include/fat.h      | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

Comments

Tom Rini Nov. 29, 2016, 5:32 p.m. UTC | #1 
On Wed, Jul 27, 2016 at 11:08:56PM -0700, Tien Fong Chee wrote:

> fill_dir_slot use get_contents_vfatname_block as a temporary buffer for
> constructing a list of dir_slot entries. To save the memory and providing
> correct type of memory for above usage, a local buffer with accurate size
> declaration is introduced.
> 
> The local array size 640 is used because for long file name entry,
> each entry use 32 bytes, one entry can store up to 13 characters.
> The maximum number of entry possible is 20. So, total size is
> 32*20=640bytes.
> 
> Signed-off-by: Genevieve Chan <ccheauya@altera.com>
> Signed-off-by: Tien Fong Chee <tfchee@altera.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c
index eb3a916..c1d48c5 100644
--- a/fs/fat/fat_write.c
+++ b/fs/fat/fat_write.c
@@ -323,7 +323,8 @@  static void flush_dir_table(fsdata *mydata, dir_entry **dentptr);
 static void
 fill_dir_slot(fsdata *mydata, dir_entry **dentptr, const char *l_name)
 {
-	dir_slot *slotptr = (dir_slot *)get_contents_vfatname_block;
+	__u8 temp_dir_slot_buffer[MAX_LFN_SLOT * sizeof(dir_slot)];
+	dir_slot *slotptr = (dir_slot *)temp_dir_slot_buffer;
 	__u8 counter = 0, checksum;
 	int idx = 0, ret;
 	char s_name[16];
diff --git a/include/fat.h b/include/fat.h
index 9d053e6..483ff7c 100644
--- a/include/fat.h
+++ b/include/fat.h
@@ -33,6 +33,8 @@ 
 #define FAT16BUFSIZE	(FATBUFSIZE/2)
 #define FAT32BUFSIZE	(FATBUFSIZE/4)
 
+/* Maximum number of entry for long file name according to spec */
+#define MAX_LFN_SLOT	20
 
 /* Filesystem identifiers */
 #define FAT12_SIGN	"FAT12   "