michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: exfat: Perform NULL check before dereference

Browse Source 
In the functions exfat_pread and exfat_pwrite there is a NULL check for
ctxt.cur_dev but this has already been derefenced twice before this
happens.
Refactor the code a bit to put the NULL check first.

This issue found by Smatch.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>
This commit is contained in:
Andrew Goodbody
2025-07-08 12:16:41 +01:00
committed by Tom Rini
parent d1d53c252a
commit 505e273475
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/exfat/io.c
View File

@@ -442,12 +442,15 @@ off_t exfat_get_size(const struct exfat_dev* dev)
ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size,
off_t offset)
{
lbaint_t sect = offset >> ctxt.cur_dev->log2blksz;
int off = offset & (ctxt.cur_dev->blksz - 1);
lbaint_t sect;
int off;
if (!ctxt.cur_dev)
return -EIO;
sect = offset >> ctxt.cur_dev->log2blksz;
off = offset & (ctxt.cur_dev->blksz - 1);
if (fs_devread(ctxt.cur_dev, &ctxt.cur_part_info, sect,
off, size, buffer))
return 0;
@@ -457,12 +460,15 @@ ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size,
ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
off_t offset)
{
lbaint_t sect = offset >> ctxt.cur_dev->log2blksz;
int off = offset & (ctxt.cur_dev->blksz - 1);
lbaint_t sect;
int off;
if (!ctxt.cur_dev)
return -EIO;
sect = offset >> ctxt.cur_dev->log2blksz;
off = offset & (ctxt.cur_dev->blksz - 1);
if (fs_devwrite(ctxt.cur_dev, &ctxt.cur_part_info, sect,
off, size, buffer))
return 0;