diff options
author | KAMBAROV, ZAUR <kambarov@berkeley.edu> | 2006-02-03 06:04:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 11:32:11 -0500 |
commit | 99603966f5b44693901ea68cef2c1c21ce6a49c3 (patch) | |
tree | 3d2e45673794c8d5d6a3627ec1843dc14cb994eb /fs | |
parent | 7656f328f68b351a8bb71ad465cedc8d0a039f9e (diff) |
[PATCH] coverity: udf/balloc.c null deref fix
It's doing
if (obh)
<stuff>
else
dereference obh
So presumably `obh' is never null in there.
This defect was found automatically by Coverity Prevent, a static analysis
tool.
Signed-off-by: Zaur Kambarov <zkambarov@coverity.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/udf/balloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 4fae57d9d115..201049ac8a96 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c | |||
@@ -579,10 +579,9 @@ static void udf_table_free_blocks(struct super_block * sb, | |||
579 | { | 579 | { |
580 | loffset = nextoffset; | 580 | loffset = nextoffset; |
581 | aed->lengthAllocDescs = cpu_to_le32(adsize); | 581 | aed->lengthAllocDescs = cpu_to_le32(adsize); |
582 | if (obh) | 582 | sptr = UDF_I_DATA(inode) + nextoffset - |
583 | sptr = UDF_I_DATA(inode) + nextoffset - udf_file_entry_alloc_offset(inode) + UDF_I_LENEATTR(inode) - adsize; | 583 | udf_file_entry_alloc_offset(inode) + |
584 | else | 584 | UDF_I_LENEATTR(inode) - adsize; |
585 | sptr = obh->b_data + nextoffset - adsize; | ||
586 | dptr = nbh->b_data + sizeof(struct allocExtDesc); | 585 | dptr = nbh->b_data + sizeof(struct allocExtDesc); |
587 | memcpy(dptr, sptr, adsize); | 586 | memcpy(dptr, sptr, adsize); |
588 | nextoffset = sizeof(struct allocExtDesc) + adsize; | 587 | nextoffset = sizeof(struct allocExtDesc) + adsize; |