From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 21 Mar 2021 12:36:17 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v4.4.263~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b84ad79e6c8b4ba69da714d47e412c829bb41eb4;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	scsi-lpfc-fix-some-error-codes-in-debugfs.patch
---

diff --git a/queue-4.4/scsi-lpfc-fix-some-error-codes-in-debugfs.patch b/queue-4.4/scsi-lpfc-fix-some-error-codes-in-debugfs.patch
new file mode 100644
index 00000000000..e41f89be4d2
--- /dev/null
+++ b/queue-4.4/scsi-lpfc-fix-some-error-codes-in-debugfs.patch
@@ -0,0 +1,41 @@
+From 19f1bc7edf0f97186810e13a88f5b62069d89097 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Fri, 12 Mar 2021 10:42:11 +0300
+Subject: scsi: lpfc: Fix some error codes in debugfs
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit 19f1bc7edf0f97186810e13a88f5b62069d89097 upstream.
+
+If copy_from_user() or kstrtoull() fail then the correct behavior is to
+return a negative error code.
+
+Link: https://lore.kernel.org/r/YEsbU/UxYypVrC7/@mwanda
+Fixes: f9bb2da11db8 ("[SCSI] lpfc 8.3.27: T10 additions for SLI4")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/lpfc/lpfc_debugfs.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/scsi/lpfc/lpfc_debugfs.c
++++ b/drivers/scsi/lpfc/lpfc_debugfs.c
+@@ -1061,7 +1061,7 @@ lpfc_debugfs_dif_err_write(struct file *
+ 	memset(dstbuf, 0, 32);
+ 	size = (nbytes < 32) ? nbytes : 32;
+ 	if (copy_from_user(dstbuf, buf, size))
+-		return 0;
++		return -EFAULT;
+ 
+ 	if (dent == phba->debug_InjErrLBA) {
+ 		if ((buf[0] == 'o') && (buf[1] == 'f') && (buf[2] == 'f'))
+@@ -1069,7 +1069,7 @@ lpfc_debugfs_dif_err_write(struct file *
+ 	}
+ 
+ 	if ((tmp == 0) && (kstrtoull(dstbuf, 0, &tmp)))
+-		return 0;
++		return -EINVAL;
+ 
+ 	if (dent == phba->debug_writeGuard)
+ 		phba->lpfc_injerr_wgrd_cnt = (uint32_t)tmp;
diff --git a/queue-4.4/series b/queue-4.4/series
index fc83a625bb1..7a8825cd0ec 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -4,3 +4,4 @@ ext4-check-journal-inode-extents-more-carefully.patch
 platform-chrome-cros_ec_dev-fix-security-issue.patch
 btrfs-fix-race-when-cloning-extent-buffer-during-rewind-of-an-old-root.patch
 nfsd-repair-misuse-of-sv_lock-in-5.10.16-rt30.patch
+scsi-lpfc-fix-some-error-codes-in-debugfs.patch