udf: fix udf_add_free_space
PATCH 1/1 udf: fix udf_add_free_space
in commit 742ba02a51c8d0bf5446b154531179760c1ed0a2 (udf: create common function for changing free space counter) by accident I reversed safety condition which lead to null pointer dereference in case of media error
and wrong counting of free space in normal situation
Signed-off-by Marcin Slusarz <[email protected]>
Cc Jan Kara <[email protected]>
--- fs/udf/balloc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/udf/balloc.c +1 -1
@@ -145,7 +145,7 @@ static bool udf_add_free_space(struct udf_sb_info *sbi, {struct logicalVolIntegrityDesc *lvid; -if (sbi->s_lvid_bh) +if (sbi->s_lvid_bh ==NULL )return false; lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data;
Signature · 1 line
1.5.3.7
[Marcin Slusarz - Sun, Feb 10, 2008 at 08:27:33PM +0100]
| in commit 742ba02a51c8d0bf5446b154531179760c1ed0a2 | (udf: create common function for changing free space counter) | by accident I reversed safety condition which lead to | null pointer dereference in case of media error | and wrong counting of free space in normal situation | | Signed-off-by: Marcin Slusarz <[email protected]> | Cc: Jan Kara <[email protected]> | --- | fs/udf/balloc.c | 2 +- | 1 files changed, 1 insertions(+), 1 deletions(-) | | diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c | index a95fcfe..1b809bd 100644 | --- a/fs/udf/balloc.c | +++ b/fs/udf/balloc.c | @@ -145,7 +145,7 @@ static bool udf_add_free_space(struct udf_sb_info *sbi, | { | struct logicalVolIntegrityDesc *lvid; | | - if (sbi->s_lvid_bh) | + if (sbi->s_lvid_bh == NULL) | return false; | | lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data; | --
Marcin, actually you've confused me - i always thought the second case is the explicit form of the first ;)
- Cyrill -
[Cyrill Gorcunov - Sun, Feb 10, 2008 at 11:00:52PM +0300]
| [Marcin Slusarz - Sun, Feb 10, 2008 at 08:27:33PM +0100] | | in commit 742ba02a51c8d0bf5446b154531179760c1ed0a2 | | (udf: create common function for changing free space counter) | | by accident I reversed safety condition which lead to | | null pointer dereference in case of media error | | and wrong counting of free space in normal situation | | | | Signed-off-by: Marcin Slusarz <[email protected]> | | Cc: Jan Kara <[email protected]> | | --- | | fs/udf/balloc.c | 2 +- | | 1 files changed, 1 insertions(+), 1 deletions(-) | | | | diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c | | index a95fcfe..1b809bd 100644 | | --- a/fs/udf/balloc.c | | +++ b/fs/udf/balloc.c | | @@ -145,7 +145,7 @@ static bool udf_add_free_space(struct udf_sb_info *sbi, | | { | | struct logicalVolIntegrityDesc *lvid; | | | | - if (sbi->s_lvid_bh) | | + if (sbi->s_lvid_bh == NULL) | | return false; | | | | lvid = (struct logicalVolIntegrityDesc *)sbi->s_lvid_bh->b_data; | | -- | | Marcin, actually you've confused me - i always thought the second case | is the explicit form of the first ;) |
oh my, it seems i've to go sleep RIGHT NOW - 'cause I'm skipping self-obvious things, damn...
Marcin, all is OK - drop my message ;)
- Cyrill -