]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 11:34:50 +0000 (12:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 11:34:50 +0000 (12:34 +0100)
added patches:
mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch
powerpc-archrandom-fix-arch_get_random_seed_int.patch
xfs-sanity-check-flags-of-q_xquotarm-call.patch

queue-4.14/series [new file with mode: 0644]
queue-4.4/mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch [new file with mode: 0644]
queue-4.4/powerpc-archrandom-fix-arch_get_random_seed_int.patch [new file with mode: 0644]
queue-4.4/series [new file with mode: 0644]
queue-4.4/xfs-sanity-check-flags-of-q_xquotarm-call.patch [new file with mode: 0644]
queue-4.9/series [new file with mode: 0644]

diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644 (file)
index 0000000..369ef1d
--- /dev/null
@@ -0,0 +1,6 @@
+xfs-sanity-check-flags-of-q_xquotarm-call.patch
+mfd-intel-lpss-add-default-i2c-device-properties-for-gemini-lake.patch
+powerpc-archrandom-fix-arch_get_random_seed_int.patch
+tipc-fix-wrong-timeout-input-for-tipc_wait_for_cond.patch
+net-phy-broadcom-fix-rgmii-delays-configuration-for-bcm54210e.patch
+mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch
diff --git a/queue-4.4/mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch b/queue-4.4/mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch
new file mode 100644 (file)
index 0000000..4a442c8
--- /dev/null
@@ -0,0 +1,38 @@
+From 15e14f76f85f4f0eab3b8146e1cd3c58ce272823 Mon Sep 17 00:00:00 2001
+From: Lorenzo Bianconi <lorenzo@kernel.org>
+Date: Sat, 21 Sep 2019 10:44:01 +0200
+Subject: mt7601u: fix bbp version check in mt7601u_wait_bbp_ready
+
+From: Lorenzo Bianconi <lorenzo@kernel.org>
+
+commit 15e14f76f85f4f0eab3b8146e1cd3c58ce272823 upstream.
+
+Fix bbp ready check in mt7601u_wait_bbp_ready. The issue is reported by
+coverity with the following error:
+
+Logical vs. bitwise operator
+The expression's value does not depend on the operands; inadvertent use
+of the wrong operator is a likely logic error.
+
+Addresses-Coverity-ID: 1309441 ("Logical vs. bitwise operator")
+Fixes: c869f77d6abb ("add mt7601u driver")
+Acked-by: Jakub Kicinski <kubakici@wp.pl>
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/mediatek/mt7601u/phy.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/mediatek/mt7601u/phy.c
++++ b/drivers/net/wireless/mediatek/mt7601u/phy.c
+@@ -219,7 +219,7 @@ int mt7601u_wait_bbp_ready(struct mt7601
+       do {
+               val = mt7601u_bbp_rr(dev, MT_BBP_REG_VERSION);
+-              if (val && ~val)
++              if (val && val != 0xff)
+                       break;
+       } while (--i);
diff --git a/queue-4.4/powerpc-archrandom-fix-arch_get_random_seed_int.patch b/queue-4.4/powerpc-archrandom-fix-arch_get_random_seed_int.patch
new file mode 100644 (file)
index 0000000..f7d891b
--- /dev/null
@@ -0,0 +1,43 @@
+From b6afd1234cf93aa0d71b4be4788c47534905f0be Mon Sep 17 00:00:00 2001
+From: Ard Biesheuvel <ardb@kernel.org>
+Date: Wed, 4 Dec 2019 11:50:15 +0000
+Subject: powerpc/archrandom: fix arch_get_random_seed_int()
+
+From: Ard Biesheuvel <ardb@kernel.org>
+
+commit b6afd1234cf93aa0d71b4be4788c47534905f0be upstream.
+
+Commit 01c9348c7620ec65
+
+  powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*
+
+updated arch_get_random_[int|long]() to be NOPs, and moved the hardware
+RNG backing to arch_get_random_seed_[int|long]() instead. However, it
+failed to take into account that arch_get_random_int() was implemented
+in terms of arch_get_random_long(), and so we ended up with a version
+of the former that is essentially a NOP as well.
+
+Fix this by calling arch_get_random_seed_long() from
+arch_get_random_seed_int() instead.
+
+Fixes: 01c9348c7620ec65 ("powerpc: Use hardware RNG for arch_get_random_seed_* not arch_get_random_*")
+Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20191204115015.18015-1-ardb@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/powerpc/include/asm/archrandom.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/include/asm/archrandom.h
++++ b/arch/powerpc/include/asm/archrandom.h
+@@ -27,7 +27,7 @@ static inline int arch_get_random_seed_i
+       unsigned long val;
+       int rc;
+-      rc = arch_get_random_long(&val);
++      rc = arch_get_random_seed_long(&val);
+       if (rc)
+               *v = val;
diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644 (file)
index 0000000..794c7e0
--- /dev/null
@@ -0,0 +1,3 @@
+xfs-sanity-check-flags-of-q_xquotarm-call.patch
+powerpc-archrandom-fix-arch_get_random_seed_int.patch
+mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch
diff --git a/queue-4.4/xfs-sanity-check-flags-of-q_xquotarm-call.patch b/queue-4.4/xfs-sanity-check-flags-of-q_xquotarm-call.patch
new file mode 100644 (file)
index 0000000..68dcf18
--- /dev/null
@@ -0,0 +1,36 @@
+From 3dd4d40b420846dd35869ccc8f8627feef2cff32 Mon Sep 17 00:00:00 2001
+From: Jan Kara <jack@suse.cz>
+Date: Wed, 23 Oct 2019 17:00:45 -0700
+Subject: xfs: Sanity check flags of Q_XQUOTARM call
+
+From: Jan Kara <jack@suse.cz>
+
+commit 3dd4d40b420846dd35869ccc8f8627feef2cff32 upstream.
+
+Flags passed to Q_XQUOTARM were not sanity checked for invalid values.
+Fix that.
+
+Fixes: 9da93f9b7cdf ("xfs: fix Q_XQUOTARM ioctl")
+Reported-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
+Signed-off-by: Jan Kara <jack@suse.cz>
+Reviewed-by: Eric Sandeen <sandeen@redhat.com>
+Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/xfs/xfs_quotaops.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/fs/xfs/xfs_quotaops.c
++++ b/fs/xfs/xfs_quotaops.c
+@@ -214,6 +214,9 @@ xfs_fs_rm_xquota(
+       if (XFS_IS_QUOTA_ON(mp))
+               return -EINVAL;
++      if (uflags & ~(FS_USER_QUOTA | FS_GROUP_QUOTA | FS_PROJ_QUOTA))
++              return -EINVAL;
++
+       if (uflags & FS_USER_QUOTA)
+               flags |= XFS_DQ_USER;
+       if (uflags & FS_GROUP_QUOTA)
diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644 (file)
index 0000000..794c7e0
--- /dev/null
@@ -0,0 +1,3 @@
+xfs-sanity-check-flags-of-q_xquotarm-call.patch
+powerpc-archrandom-fix-arch_get_random_seed_int.patch
+mt7601u-fix-bbp-version-check-in-mt7601u_wait_bbp_ready.patch