[U-Boot] [PATCH 1/1] fs: avoid possible NULL dereference in fs_devread
It is unwise to first dereference a variable and then to check if it was NULL.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- fs/fs_internal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/fs_internal.c b/fs/fs_internal.c index 58b441030c..5cdd272c9d 100644 --- a/fs/fs_internal.c +++ b/fs/fs_internal.c @@ -15,12 +15,13 @@ int fs_devread(struct blk_desc *blk, disk_partition_t *partition, lbaint_t sector, int byte_offset, int byte_len, char *buf) { unsigned block_len; - int log2blksz = blk->log2blksz; + int log2blksz; ALLOC_CACHE_ALIGN_BUFFER(char, sec_buf, (blk ? blk->blksz : 0)); if (blk == NULL) { printf("** Invalid Block Device Descriptor (NULL)\n"); return 0; } + log2blksz = blk->log2blksz;
/* Check partition boundaries */ if ((sector + ((byte_offset + byte_len - 1) >> log2blksz))
On Mon, Nov 20, 2017 at 6:49 AM, Heinrich Schuchardt xypron.glpk@gmx.de wrote:
It is unwise to first dereference a variable and then to check if it was NULL.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
fs/fs_internal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Sun, Nov 19, 2017 at 11:49:21PM +0100, Heinrich Schuchardt wrote:
It is unwise to first dereference a variable and then to check if it was NULL.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de Reviewed-by: Marek Behun marek.behun@nic.cz Reviewed-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot/master, thanks!
participants (4)
-
Bin Meng -
Heinrich Schuchardt -
Marek Behun -
Tom Rini