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> Reviewed-by: Marek Behun <marek.behun@nic.cz> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

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> Reviewed-by: Marek Behun <marek.behun@nic.cz> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Heinrich Schuchardt · Tom Rini
1 parent 254eedee7f
Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff
fs/fs_internal.c
@@ -15,12 +15,13 @@
 	       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))
...	...	@@ -15,12 +15,13 @@
15	15	lbaint_t sector, int byte_offset, int byte_len, char *buf)
16	16	{
17	17	unsigned block_len;
18		- int log2blksz = blk->log2blksz;
	18	+ int log2blksz;
19	19	ALLOC_CACHE_ALIGN_BUFFER(char, sec_buf, (blk ? blk->blksz : 0));
20	20	if (blk == NULL) {
21	21	printf("** Invalid Block Device Descriptor (NULL)\n");
22	22	return 0;
23	23	}
	24	+ log2blksz = blk->log2blksz;
24	25
25	26	/* Check partition boundaries */
26	27	if ((sector + ((byte_offset + byte_len - 1) >> log2blksz))