pipe: Fix bogus dereference in iov_iter_alignment()
Subsystems (3)
Jan Kara
reviewerPATCH 1/1 pipe: Fix bogus dereference in iov_iter_alignment()
We cannot look at 'i->pipe' unless we know the iter is a pipe. Move the ring_size load to a branch in iov_iter_alignment() where we've already checked the iter is a pipe to avoid bogus dereference.
--- lib/iov_iter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Al, David, not sure who's going to merge this so sending to both :).
Honza
lib/iov_iter.c +2 -1
@@ -1222,11 +1222,12 @@ EXPORT_SYMBOL(iov_iter_discard);unsigned long iov_iter_alignment (const struct iov_iter *i) { -unsigned int p_mask = i->pipe->ring_size -1 ;unsigned long res =0 ;size_t size = i->count;if (unlikely (iov_iter_is_pipe (i))) { +unsigned int p_mask = i->pipe->ring_size -1 ; +if (size && i->iov_offset &&allocated (&i->pipe->bufs[i->head & p_mask]))return size | i->iov_offset;return size;
Signature · 1 line
2.16.4
Quoted 4 lines · Jan Kara
We cannot look at '
i->pipe' unless we know the iter is a pipe. Move thering_sizeload to a branch iniov_iter_alignment()where we've already checked the iter is a pipe to avoid bogus dereference.
Quoted 8 lines
Reported-by [email protected]Fixes 8cefc107ca54 ("pipe: Use head and tail pointers for the ring, not cursor and length")Signed-off-by Jan Kara <[email protected]>--- lib/iov_iter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Al, David, not sure who's going to merge this so sending to both :).
Applied, will push tonight.
Quoted 7 lines · Jan Kara
We cannot look at '
i->pipe' unless we know the iter is a pipe. Move thering_sizeload to a branch iniov_iter_alignment()where we've already checked the iter is a pipe to avoid bogus dereference.Reported-by [email protected]Fixes 8cefc107ca54 ("pipe: Use head and tail pointers for the ring, not cursor and length")Signed-off-by Jan Kara <[email protected]>