4.19-stable patches

added patches:
	ext4-work-around-deleting-a-file-with-i_nlink-0-safely.patch
	firmware-qcom-scm-ensure-a0-status-code-is-treated-as-signed.patch

diff --git a/queue-4.19/ext4-work-around-deleting-a-file-with-i_nlink-0-safely.patch b/queue-4.19/ext4-work-around-deleting-a-file-with-i_nlink-0-safely.patch
new file mode 100644 (file)
index 0000000..ff91fb3
--- /dev/null
+++ b/queue-4.19/ext4-work-around-deleting-a-file-with-i_nlink-0-safely.patch
@@ -0,0 +1,61 @@
+From c7df4a1ecb8579838ec8c56b2bb6a6716e974f37 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Mon, 11 Nov 2019 22:18:13 -0500
+Subject: ext4: work around deleting a file with i_nlink == 0 safely
+
+From: Theodore Ts'o <tytso@mit.edu>
+
+commit c7df4a1ecb8579838ec8c56b2bb6a6716e974f37 upstream.
+
+If the file system is corrupted such that a file's i_links_count is
+too small, then it's possible that when unlinking that file, i_nlink
+will already be zero.  Previously we were working around this kind of
+corruption by forcing i_nlink to one; but we were doing this before
+trying to delete the directory entry --- and if the file system is
+corrupted enough that ext4_delete_entry() fails, then we exit with
+i_nlink elevated, and this causes the orphan inode list handling to be
+FUBAR'ed, such that when we unmount the file system, the orphan inode
+list can get corrupted.
+
+A better way to fix this is to simply skip trying to call drop_nlink()
+if i_nlink is already zero, thus moving the check to the place where
+it makes the most sense.
+
+https://bugzilla.kernel.org/show_bug.cgi?id=205433
+
+Link: https://lore.kernel.org/r/20191112032903.8828-1-tytso@mit.edu
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Cc: stable@kernel.org
+Reviewed-by: Andreas Dilger <adilger@dilger.ca>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/ext4/namei.c |   11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+--- a/fs/ext4/namei.c
++++ b/fs/ext4/namei.c
+@@ -3056,18 +3056,17 @@ static int ext4_unlink(struct inode *dir
+       if (IS_DIRSYNC(dir))
+               ext4_handle_sync(handle);
+ 
+-      if (inode->i_nlink == 0) {
+-              ext4_warning_inode(inode, "Deleting file '%.*s' with no links",
+-                                 dentry->d_name.len, dentry->d_name.name);
+-              set_nlink(inode, 1);
+-      }
+       retval = ext4_delete_entry(handle, dir, de, bh);
+       if (retval)
+               goto end_unlink;
+       dir->i_ctime = dir->i_mtime = current_time(dir);
+       ext4_update_dx_flag(dir);
+       ext4_mark_inode_dirty(handle, dir);
+-      drop_nlink(inode);
++      if (inode->i_nlink == 0)
++              ext4_warning_inode(inode, "Deleting file '%.*s' with no links",
++                                 dentry->d_name.len, dentry->d_name.name);
++      else
++              drop_nlink(inode);
+       if (!inode->i_nlink)
+               ext4_orphan_add(handle, inode);
+       inode->i_ctime = current_time(inode);

diff --git a/queue-4.19/firmware-qcom-scm-ensure-a0-status-code-is-treated-as-signed.patch b/queue-4.19/firmware-qcom-scm-ensure-a0-status-code-is-treated-as-signed.patch
new file mode 100644 (file)
index 0000000..6e34b10
--- /dev/null
+++ b/queue-4.19/firmware-qcom-scm-ensure-a0-status-code-is-treated-as-signed.patch
@@ -0,0 +1,34 @@
+From ff34f3cce278a0982a7b66b1afaed6295141b1fc Mon Sep 17 00:00:00 2001
+From: Will Deacon <will@kernel.org>
+Date: Mon, 4 Nov 2019 15:58:15 +0000
+Subject: firmware: qcom: scm: Ensure 'a0' status code is treated as signed
+
+From: Will Deacon <will@kernel.org>
+
+commit ff34f3cce278a0982a7b66b1afaed6295141b1fc upstream.
+
+The 'a0' member of 'struct arm_smccc_res' is declared as 'unsigned long',
+however the Qualcomm SCM firmware interface driver expects to receive
+negative error codes via this field, so ensure that it's cast to 'long'
+before comparing to see if it is less than 0.
+
+Cc: <stable@vger.kernel.org>
+Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Signed-off-by: Will Deacon <will@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/firmware/qcom_scm-64.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/firmware/qcom_scm-64.c
++++ b/drivers/firmware/qcom_scm-64.c
+@@ -158,7 +158,7 @@ static int qcom_scm_call(struct device *
+               kfree(args_virt);
+       }
+ 
+-      if (res->a0 < 0)
++      if ((long)res->a0 < 0)
+               return qcom_scm_remap_error(res->a0);
+ 
+       return 0;

diff --git a/queue-4.19/series b/queue-4.19/series
index 90e9aa1dfc15b7ae10e31f31748fafca395a286e..4ea4ac59a56208f546a60dd2752f96bfe929273e 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -129,3 +129,5 @@ ath10k-fix-fw-crash-by-moving-chip-reset-after-napi-.patch
 regulator-88pm800-fix-warning-same-module-names.patch
 powerpc-avoid-clang-warnings-around-setjmp-and-longj.patch
 powerpc-fix-vdso-clock_getres.patch
+ext4-work-around-deleting-a-file-with-i_nlink-0-safely.patch
+firmware-qcom-scm-ensure-a0-status-code-is-treated-as-signed.patch