fs/fat: Fix 'CACHE: Misaligned operation at range' warnings

PATCH New Tuomas Tynkkynen 2 participants 6 messages Sep 30, 2017 – Oct 9, 2017 VFAT/FAT/msdos filesystem

Share & tools

Tuomas Tynkkynen

author

2017-09-30 23:25 UTC #0 lore raw

PATCH v2 1/2 fs/fat: Fix 'CACHE: Misaligned operation at range' warnings

The 'block' field of fat_itr needs to be properly aligned for DMA and while it does have '__aligned(ARCH_DMA_MINALIGN)', the fat_itr structure itself needs to be properly aligned as well.

While at it use malloc_cache_aligned() for the other aligned allocations in the file as well.

Fixes 2460098cffacd1 ("fs/fat: Reduce stack usage")

Signed-off-by Tuomas Tynkkynen <[email protected]>

---
v2: No change

---
 fs/fat/fat.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

fs/fat/fat.c +5 -5

index 3d3e17e8fa..35941c1498 100644
@@ -495,7 +495,7 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
 		return -1;
 	}
 
-	block = memalign(ARCH_DMA_MINALIGN, cur_dev->blksz);
+	block = malloc_cache_aligned(cur_dev->blksz);
 	if (block == NULL) {
 		debug("Error: allocating block\n");
 		return -1;

@@ -599,7 +599,7 @@ static int get_fs_info(fsdata *mydata)
 
 	mydata->fatbufnum = -1;
 	mydata->fat_dirty = 0;
-	mydata->fatbuf = memalign(ARCH_DMA_MINALIGN, FATBUFSIZE);
+	mydata->fatbuf = malloc_cache_aligned(FATBUFSIZE);
 	if (mydata->fatbuf == NULL) {
 		debug("Error: allocating memory\n");
 		return -1;

@@ -1038,7 +1038,7 @@ int fat_exists(const char *filename)
 	fat_itr *itr;
 	int ret;
 
-	itr = malloc(sizeof(fat_itr));
+	itr = malloc_cache_aligned(sizeof(fat_itr));
 	ret = fat_itr_root(itr, &fsdata);
 	if (ret)
 		return 0;

@@ -1055,7 +1055,7 @@ int fat_size(const char *filename, loff_t *size)
 	fat_itr *itr;
 	int ret;
 
-	itr = malloc(sizeof(fat_itr));
+	itr = malloc_cache_aligned(sizeof(fat_itr));
 	ret = fat_itr_root(itr, &fsdata);
 	if (ret)
 		return ret;

@@ -1089,7 +1089,7 @@ int file_fat_read_at(const char *filename, loff_t pos, void *buffer,
 	fat_itr *itr;
 	int ret;
 
-	itr = malloc(sizeof(fat_itr));
+	itr = malloc_cache_aligned(sizeof(fat_itr));
 	ret = fat_itr_root(itr, &fsdata);
 	if (ret)
 		return ret;

Signature · 1 line

2.13.0

Tuomas Tynkkynen

author

2017-09-30 23:25 UTC #1 lore raw

PATCH v2 2/2 fs/fat: Check malloc return values and fix memory leaks

Check malloc() return values and properly unwind on errors so memory allocated for fat_itr structures get freed properly.

Also fixes a leak of fsdata.fatbuf in fat_size().

Fixes 2460098cffacd1 ("fs/fat: Reduce stack usage")

Reported-by Coverity (CID: 167225, 167233, 167234)

Signed-off-by Tuomas Tynkkynen <[email protected]>

---
v2: New patch

---
 fs/fat/fat.c | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

fs/fat/fat.c +20 ~~-10~~

index 35941c1498..7fe78439cf 100644
@@ -1039,12 +1039,15 @@ int fat_exists(const char *filename)
 	int ret;
 
 	itr = malloc_cache_aligned(sizeof(fat_itr));
+	if (!itr)
+		return 0;
 	ret = fat_itr_root(itr, &fsdata);
 	if (ret)
-		return 0;
+		goto out;
 
 	ret = fat_itr_resolve(itr, filename, TYPE_ANY);
 	free(fsdata.fatbuf);
+out:
 	free(itr);
 	return ret == 0;
 }

@@ -1056,9 +1059,11 @@ int fat_size(const char *filename, loff_t *size)
 	int ret;
 
 	itr = malloc_cache_aligned(sizeof(fat_itr));
+	if (!itr)
+		return -ENOMEM;
 	ret = fat_itr_root(itr, &fsdata);
 	if (ret)
-		return ret;
+		goto out_free_itr;
 
 	ret = fat_itr_resolve(itr, filename, TYPE_FILE);
 	if (ret) {

@@ -1072,12 +1077,13 @@ int fat_size(const char *filename, loff_t *size)
 			*size = 0;
 			ret = 0;
 		}
-		goto out;
+		goto out_free_both;
 	}
 
 	*size = FAT2CPU32(itr->dent->size);
+out_free_both:
 	free(fsdata.fatbuf);
-out:
+out_free_itr:
 	free(itr);
 	return ret;
 }

@@ -1090,19 +1096,22 @@ int file_fat_read_at(const char *filename, loff_t pos, void *buffer,
 	int ret;
 
 	itr = malloc_cache_aligned(sizeof(fat_itr));
+	if (!itr)
+		return -ENOMEM;
 	ret = fat_itr_root(itr, &fsdata);
 	if (ret)
-		return ret;
+		goto out_free_itr;
 
 	ret = fat_itr_resolve(itr, filename, TYPE_FILE);
 	if (ret)
-		goto out;
+		goto out_free_both;
 
 	printf("reading %s\n", filename);
 	ret = get_contents(&fsdata, itr->dent, pos, buffer, maxsize, actread);
 
-out:
+out_free_both:
 	free(fsdata.fatbuf);
+out_free_itr:
 	free(itr);
 	return ret;
 }

@@ -1148,17 +1157,18 @@ int fat_opendir(const char *filename, struct fs_dir_stream **dirsp)
 
 	ret = fat_itr_root(&dir->itr, &dir->fsdata);
 	if (ret)
-		goto fail;
+		goto fail_free_dir;
 
 	ret = fat_itr_resolve(&dir->itr, filename, TYPE_DIR);
 	if (ret)
-		goto fail;
+		goto fail_free_both;
 
 	*dirsp = (struct fs_dir_stream *)dir;
 	return 0;
 
-fail:
+fail_free_both:
 	free(dir->fsdata.fatbuf);
+fail_free_dir:
 	free(dir);
 	return ret;
 }

Signature · 1 line

2.13.0

Tom Rini

2017-09-30 23:28 UTC #2 lore raw

PATCH v2 2/2 fs/fat: Check malloc return values and fix memory leaks

Quoted 8 lines · Tuomas Tynkkynen

Check malloc() return values and properly unwind on errors so memory allocated for fat_itr structures get freed properly.
Also fixes a leak of fsdata.fatbuf in fat_size().
Fixes 2460098cffacd1 ("fs/fat: Reduce stack usage")
Reported-by Coverity (CID: 167225, 167233, 167234)
Signed-off-by Tuomas Tynkkynen <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170930/358454b1/attachment.sig>

Tom Rini

2017-10-09 17:01 UTC #3 lore raw

PATCH v2 2/2 fs/fat: Check malloc return values and fix memory leaks

In reply to Tuomas Tynkkynen

Quoted 9 lines · Tuomas Tynkkynen

Check malloc() return values and properly unwind on errors so memory allocated for fat_itr structures get freed properly.
Also fixes a leak of fsdata.fatbuf in fat_size().
Fixes 2460098cffacd1 ("fs/fat: Reduce stack usage")
Reported-by Coverity (CID: 167225, 167233, 167234)
Signed-off-by Tuomas Tynkkynen <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171009/98f6f13b/attachment.sig>

Tom Rini

2017-09-30 23:27 UTC #4 lore raw

PATCH v2 1/2 fs/fat: Fix 'CACHE: Misaligned operation at range' warnings

In reply to Tuomas Tynkkynen

Quoted 9 lines · Tuomas Tynkkynen

The 'block' field of fat_itr needs to be properly aligned for DMA and while it does have '__aligned(ARCH_DMA_MINALIGN)', the fat_itr structure itself needs to be properly aligned as well.
While at it use malloc_cache_aligned() for the other aligned allocations in the file as well.
Fixes 2460098cffacd1 ("fs/fat: Reduce stack usage")
Signed-off-by Tuomas Tynkkynen <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170930/03b2e0b2/attachment.sig>

Tom Rini

2017-10-09 17:01 UTC #5 lore raw

PATCH v2 1/2 fs/fat: Fix 'CACHE: Misaligned operation at range' warnings

In reply to Tuomas Tynkkynen

Quoted 10 lines · Tuomas Tynkkynen

The 'block' field of fat_itr needs to be properly aligned for DMA and while it does have '__aligned(ARCH_DMA_MINALIGN)', the fat_itr structure itself needs to be properly aligned as well.
While at it use malloc_cache_aligned() for the other aligned allocations in the file as well.
Fixes 2460098cffacd1 ("fs/fat: Reduce stack usage")
Signed-off-by Tuomas Tynkkynen <[email protected]>
Reviewed-by Tom Rini <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171009/5f2eba6d/attachment.sig>