Commit 67f5d06d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs 

Pull a 9p bugfix from Eric Van Hensbergen.

* 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: BUG before corrupting memory
parents 48d4e137 5fcb08be

net/9p/trans_virtio.c

+1 −1
Original line number Diff line number Diff line
@@ -192,10 +192,10 @@ static int pack_sg_list(struct scatterlist *sg, int start, 
		s = rest_of_page(data);

		if (s > count)

			s = count;

		BUG_ON(index > limit);

		sg_set_buf(&sg[index++], data, s);

		count -= s;

		data += s;

		BUG_ON(index > limit);

	}



	return index-start;