fs: exfat: Fix some Smatch issues
cover fs: exfat: Fix some Smatch issues
Smatch reported issues with variables being dereferenced before NULL checks and also testing an unsigned variable for being negative.
---
Andrew Goodbody (2):
fs: exfat: Perform NULL check before dereference
fs: exfat: Remove pointless variable uoffset
fs/exfat/io.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-)
---
base-commit: d1d53c252a4a746db5ebcdf0d6de3aa0feec504e
change-id: 20250707-exfat_fix-38bbcd416f9e
Best regards,
Signature · 1 line
Andrew Goodbody <[email protected]>
PATCH 1/2 fs: exfat: Perform NULL check before dereference
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.
--- fs/exfat/io.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
fs/exfat/io.c +10 -4
@@ -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 ;
Signature · 1 line
2.39.5
PATCH 2/2 fs: exfat: Remove pointless variable uoffset
In reply to Andrew GoodbodyIn exfat_generic_pread and exfat_generic_pwrite offset is passed in as a off_t type which is defined as 'unsigned long long' so there is no need to create the variable uoffset as a uint64_t as this is just a direct copy of offset. Also remove the impossible test of 'offset < 0' as this is always false due to offset being unsigned.
This issue found by Smatch.
--- fs/exfat/io.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-)
fs/exfat/io.c +17 -23
@@ -479,43 +479,40 @@ ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,ssize_t exfat_generic_pread (const struct exfat * ef,struct exfat_node * node,void * buffer,size_t size,off_t offset) { -uint64_t uoffset = offset;cluster_t cluster;char * bufp = buffer;off_t lsize, loffset, remainder; -if (offset <0 ) -return -EINVAL ; -if (uoffset >= node->size) +if (offset >= node->size)return 0 ;if (size ==0 )return 0 ; -if (uoffset + size > node->valid_size) +if (offset + size > node->valid_size) {ssize_t bytes =0 ; -if (uoffset < node->valid_size) +if (offset < node->valid_size) { bytes =exfat_generic_pread (ef, node, buffer, - node->valid_size - uoffset, offset); -if (bytes <0 || (size_t ) bytes < node->valid_size - uoffset) + node->valid_size - offset, offset); +if (bytes <0 || (size_t )bytes < node->valid_size - offset)return bytes; }memset (buffer + bytes,0 ,MIN (size - bytes, node->size - node->valid_size)); -return MIN (size, node->size - uoffset); +return MIN (size, node->size - offset); } - cluster =exfat_advance_cluster (ef, node, uoffset /CLUSTER_SIZE (*ef->sb)); + cluster =exfat_advance_cluster (ef, node, offset /CLUSTER_SIZE (*ef->sb));if (CLUSTER_INVALID (*ef->sb, cluster)) {exfat_error ("invalid cluster 0x%x while reading" , cluster);return -EIO ; } - loffset = uoffset %CLUSTER_SIZE (*ef->sb); - remainder =MIN (size, node->size - uoffset); + loffset = offset %CLUSTER_SIZE (*ef->sb); + remainder =MIN (size, node->size - offset);while (remainder >0 ) {if (CLUSTER_INVALID (*ef->sb, cluster))
@@ -537,43 +534,40 @@ ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, }if (!(node->attrib &EXFAT_ATTRIB_DIR ) && !ef->ro && !ef->noatime)exfat_update_atime (node); -return MIN (size, node->size - uoffset) - remainder; +return MIN (size, node->size - offset) - remainder; }ssize_t exfat_generic_pwrite (struct exfat * ef,struct exfat_node * node,const void * buffer,size_t size,off_t offset) { -uint64_t uoffset = offset;int rc;cluster_t cluster;const char * bufp = buffer;off_t lsize, loffset, remainder; -if (offset <0 ) -return -EINVAL ; -if (uoffset > node->size) +if (offset > node->size) { - rc =exfat_truncate (ef, node, uoffset, true); + rc =exfat_truncate (ef, node, offset, true);if (rc !=0 )return rc; } -if (uoffset + size > node->size) +if (offset + size > node->size) { - rc =exfat_truncate (ef, node, uoffset + size, false); + rc =exfat_truncate (ef, node, offset + size, false);if (rc !=0 )return rc; }if (size ==0 )return 0 ; - cluster =exfat_advance_cluster (ef, node, uoffset /CLUSTER_SIZE (*ef->sb)); + cluster =exfat_advance_cluster (ef, node, offset /CLUSTER_SIZE (*ef->sb));if (CLUSTER_INVALID (*ef->sb, cluster)) {exfat_error ("invalid cluster 0x%x while writing" , cluster);return -EIO ; } - loffset = uoffset %CLUSTER_SIZE (*ef->sb); + loffset = offset %CLUSTER_SIZE (*ef->sb); remainder = size;while (remainder >0 ) {
@@ -592,7 +586,7 @@ ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node, bufp += lsize; loffset =0 ; remainder -= lsize; - node->valid_size =MAX (node->valid_size, uoffset + size - remainder); + node->valid_size =MAX (node->valid_size, offset + size - remainder); cluster =exfat_next_cluster (ef, node, cluster); }if (!(node->attrib &EXFAT_ATTRIB_DIR ))
Signature · 1 line
2.39.5
Quoted 4 lines · Andrew Goodbody
Smatch reported issues with variables being dereferenced before NULL checks and also testing an unsigned variable for being negative.
Applied to u-boot/master, thanks!
[1/2] fs: exfat: Perform NULL check before dereference
commit: 505e2734756018af953d2e5bd1cd6ff7b66b0cdb
[2/2] fs: exfat: Remove pointless variable uoffset
commit: dd4693136b33f2b175e8cedecf9d76e391acabdfSignature · 1 line
Tom