X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=lib%2Fscatterlist.c;h=4ceb05d772aed12d392d618358284ea71cb51dd2;hb=86f3cbec4a193c04d0a31c13132c5956731af6ff;hp=a5ec42868f99d8d6700f34ca81c061c1ef21d15b;hpb=29cfcddc0e745b515ec360ffe2ee4e7a4015efd8;p=mirror_ubuntu-artful-kernel.git

diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index a5ec42868f99..4ceb05d772ae 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -248,8 +248,18 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
 		left -= sg_size;
 
 		sg = alloc_fn(alloc_size, gfp_mask);
-		if (unlikely(!sg))
-			return -ENOMEM;
+		if (unlikely(!sg)) {
+			/*
+			 * Adjust entry count to reflect that the last
+			 * entry of the previous table won't be used for
+			 * linkage.  Without this, sg_kfree() may get
+			 * confused.
+			 */
+			if (prv)
+				table->nents = ++table->orig_nents;
+
+ 			return -ENOMEM;
+		}
 
 		sg_init_table(sg, alloc_size);
 		table->nents = table->orig_nents += sg_size;