Commit 27daabd9 authored Jul 08, 2013 by Dan Carpenter Committed by Linus Torvalds Jul 09, 2013

lib/scatterlist: error handling in __sg_alloc_table()

I was reviewing code which I suspected might allocate a zero size SG
table.  That will cause memory corruption.  Also we can't return before
doing the memset or we could end up using uninitialized memory in the
cleanup path.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a4517511

lib/scatterlist.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -247,13 +247,15 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
		struct scatterlist sg, prv;
		unsigned int left;

		memset(table, 0, sizeof(*table));

		if (nents == 0)
		return -EINVAL;
		#ifndef ARCH_HAS_SG_CHAIN
		if (WARN_ON_ONCE(nents > max_ents))
		return -EINVAL;
		#endif

		memset(table, 0, sizeof(*table));

		left = nents;
		prv = NULL;
		do {

Admin message