From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 26 Jun 2020 14:29:25 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.7.7~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=570d8bb5f9e5a38a9190cadd980cc4ec4e2082df;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	block-bio-integrity-don-t-free-buf-if-bio_integrity_add_page-failed.patch
---

diff --git a/queue-5.4/block-bio-integrity-don-t-free-buf-if-bio_integrity_add_page-failed.patch b/queue-5.4/block-bio-integrity-don-t-free-buf-if-bio_integrity_add_page-failed.patch
new file mode 100644
index 00000000000..a429275db8e
--- /dev/null
+++ b/queue-5.4/block-bio-integrity-don-t-free-buf-if-bio_integrity_add_page-failed.patch
@@ -0,0 +1,37 @@
+From a75ca9303175d36af93c0937dd9b1a6422908b8d Mon Sep 17 00:00:00 2001
+From: yu kuai <yukuai3@huawei.com>
+Date: Mon, 1 Jun 2020 20:38:56 +0800
+Subject: block/bio-integrity: don't free 'buf' if bio_integrity_add_page() failed
+
+From: yu kuai <yukuai3@huawei.com>
+
+commit a75ca9303175d36af93c0937dd9b1a6422908b8d upstream.
+
+commit e7bf90e5afe3 ("block/bio-integrity: fix a memory leak bug") added
+a kfree() for 'buf' if bio_integrity_add_page() returns '0'. However,
+the object will be freed in bio_integrity_free() since 'bio->bi_opf' and
+'bio->bi_integrity' were set previousy in bio_integrity_alloc().
+
+Fixes: commit e7bf90e5afe3 ("block/bio-integrity: fix a memory leak bug")
+Signed-off-by: yu kuai <yukuai3@huawei.com>
+Reviewed-by: Ming Lei <ming.lei@redhat.com>
+Reviewed-by: Bob Liu <bob.liu@oracle.com>
+Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ block/bio-integrity.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/block/bio-integrity.c
++++ b/block/bio-integrity.c
+@@ -278,7 +278,6 @@ bool bio_integrity_prep(struct bio *bio)
+ 
+ 		if (ret == 0) {
+ 			printk(KERN_ERR "could not attach integrity payload\n");
+-			kfree(buf);
+ 			status = BLK_STS_RESOURCE;
+ 			goto err_end_io;
+ 		}