aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorKAMBAROV, ZAUR <kambarov@berkeley.edu>2005-06-28 23:45:10 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 00:20:33 -0400
commitec471dc484b8ca5352903ee28796b8b248313547 (patch)
tree8ddb154379fca4913b3fe0930b3e80fc2208edc5 /fs/udf
parent9c101fd439dab60d6eba76afb35fd2696f42c63d (diff)
[PATCH] coverity: fs/udf/namei.c null check
"dir" was dereferenced before null check 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/udf')
-rw-r--r--fs/udf/namei.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index 3f6dc7112bc6..4673157b262f 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -159,7 +159,7 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
159 char *nameptr; 159 char *nameptr;
160 uint8_t lfi; 160 uint8_t lfi;
161 uint16_t liu; 161 uint16_t liu;
162 loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2; 162 loff_t size;
163 kernel_lb_addr bloc, eloc; 163 kernel_lb_addr bloc, eloc;
164 uint32_t extoffset, elen, offset; 164 uint32_t extoffset, elen, offset;
165 struct buffer_head *bh = NULL; 165 struct buffer_head *bh = NULL;
@@ -167,6 +167,8 @@ udf_find_entry(struct inode *dir, struct dentry *dentry,
167 if (!dir) 167 if (!dir)
168 return NULL; 168 return NULL;
169 169
170 size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
171
170 f_pos = (udf_ext0_offset(dir) >> 2); 172 f_pos = (udf_ext0_offset(dir) >> 2);
171 173
172 fibh->soffset = fibh->eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2; 174 fibh->soffset = fibh->eoffset = (f_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;