Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
udf: fix directory offset handling
Patch cleaning up UDF directory offset handling missed modifications in dir.c
(because I've submitted an old version :(). Fix it.
Signed-off-by: Jan Kara <jack@suse.cz>
Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Tested-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by Jan Kara and committed by Linus Torvalds e28d80f1 ac76cff2
+7
-7
fs/udf/dir.c
+7
-7
fs/udf/dir.c
···
43
43
struct fileIdentDesc *fi = NULL;
44
44
struct fileIdentDesc cfi;
45
45
int block, iblock;
46
-
loff_t nf_pos = filp->f_pos - 1;
46
+
loff_t nf_pos = (filp->f_pos - 1) << 2;
47
47
int flen;
48
48
char fname[UDF_NAME_LEN];
49
49
char *nameptr;
50
50
uint16_t liu;
51
51
uint8_t lfi;
52
-
loff_t size = (udf_ext0_offset(dir) + dir->i_size) >> 2;
52
+
loff_t size = udf_ext0_offset(dir) + dir->i_size;
53
53
struct buffer_head *tmp, *bha[16];
54
54
kernel_lb_addr eloc;
55
55
uint32_t elen;
···
63
63
return 0;
64
64
65
65
if (nf_pos == 0)
66
-
nf_pos = (udf_ext0_offset(dir) >> 2);
66
+
nf_pos = udf_ext0_offset(dir);
67
67
68
-
fibh.soffset = fibh.eoffset = (nf_pos & ((dir->i_sb->s_blocksize - 1) >> 2)) << 2;
68
+
fibh.soffset = fibh.eoffset = nf_pos & (dir->i_sb->s_blocksize - 1);
69
69
iinfo = UDF_I(dir);
70
70
if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) {
71
71
fibh.sbh = fibh.ebh = NULL;
72
-
} else if (inode_bmap(dir, nf_pos >> (dir->i_sb->s_blocksize_bits - 2),
72
+
} else if (inode_bmap(dir, nf_pos >> dir->i_sb->s_blocksize_bits,
73
73
&epos, &eloc, &elen, &offset) == (EXT_RECORDED_ALLOCATED >> 30)) {
74
74
block = udf_get_lb_pblock(dir->i_sb, eloc, offset);
75
75
if ((++offset << dir->i_sb->s_blocksize_bits) < elen) {
···
111
111
}
112
112
113
113
while (nf_pos < size) {
114
-
filp->f_pos = nf_pos + 1;
114
+
filp->f_pos = (nf_pos >> 2) + 1;
115
115
116
116
fi = udf_fileident_read(dir, &nf_pos, &fibh, &cfi, &epos, &eloc,
117
117
&elen, &offset);
···
178
178
}
179
179
} /* end while */
180
180
181
-
filp->f_pos = nf_pos + 1;
181
+
filp->f_pos = (nf_pos >> 2) + 1;
182
182
183
183
if (fibh.sbh != fibh.ebh)
184
184
brelse(fibh.ebh);