summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-03-16 11:46:25 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-03-16 11:46:25 -0500
commit78a0eb2782c2c22e03ac329ea41cc9e1a7e26de3 (patch)
treeab208adfa1db2caf514226de9bc9da2a8dca5e36
parent13b554ba381dc2ed0f853452d46814ba2458b10c (diff)
downloadkernel-78a0eb2782c2c22e03ac329ea41cc9e1a7e26de3.tar.gz
kernel-78a0eb2782c2c22e03ac329ea41cc9e1a7e26de3.tar.xz
kernel-78a0eb2782c2c22e03ac329ea41cc9e1a7e26de3.zip
kernel-5.16.15-0
* Wed Mar 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.15-0] - nfc: st21nfca: Fix potential buffer overflows in EVT_TRANSACTION (Jordy Zomer) - Restrict FS_LOCATIONS to NFS v4.2+ to work around Qnap knfsd-3.4.6 bug (Justin M. Forbes) - Turn on VDPA_SIM_BLOCK (Justin M. Forbes) - Fix up changelog (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Patchlist.changelog6
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-i686-debug-fedora.config2
-rw-r--r--kernel-i686-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rwxr-xr-xkernel.spec16
-rw-r--r--patch-5.16-redhat.patch126
-rw-r--r--sources6
18 files changed, 97 insertions, 85 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog
index b04c1b792..f803e6146 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/c6295fc9bb25d3684c10aaa89e00f5e12ccd4dd2
+ c6295fc9bb25d3684c10aaa89e00f5e12ccd4dd2 nfc: st21nfca: Fix potential buffer overflows in EVT_TRANSACTION
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/e9849fac129d5c7acb0556e0d29f0b3bf5103c0e
+ e9849fac129d5c7acb0556e0d29f0b3bf5103c0e Restrict FS_LOCATIONS to NFS v4.2+ to work around Qnap knfsd-3.4.6 bug
+
https://gitlab.com/cki-project/kernel-ark/-/commit/ce338c425415d1e9623815d79bb88a98818f4157
ce338c425415d1e9623815d79bb88a98818f4157 Revert "PCI/MSI: Mask MSI-X vectors only on success"
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 6e1aee6a1..caa900ea4 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -8121,7 +8121,7 @@ CONFIG_VCNL3020=m
CONFIG_VCNL4000=m
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 9043feddb..5ebf283c4 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -8095,7 +8095,7 @@ CONFIG_VCNL3020=m
CONFIG_VCNL4000=m
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 0f277836d..e180753dc 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -8348,7 +8348,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 07e6f4a27..138f83424 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -8323,7 +8323,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 93afddbf0..1daab9601 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -8103,7 +8103,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 558ba9e95..be4df29e6 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -8078,7 +8078,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index c764adfd9..76b83b889 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -7275,7 +7275,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index e09e1b544..6f34ca215 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -7250,7 +7250,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c6a4fda73..19409e608 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -6948,7 +6948,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 8b30566cd..11b069ce3 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -6922,7 +6922,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 79637d35f..a38ae30b3 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -6901,7 +6901,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 16ce39e9a..3f37d73b7 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -6875,7 +6875,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 90934340c..2def07cf9 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -7328,7 +7328,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 5dba26426..4843669a4 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -7303,7 +7303,7 @@ CONFIG_VCNL3020=m
# CONFIG_VCNL4000 is not set
CONFIG_VCNL4035=m
CONFIG_VDPA=m
-# CONFIG_VDPA_SIM_BLOCK is not set
+CONFIG_VDPA_SIM_BLOCK=m
CONFIG_VDPA_SIM=m
CONFIG_VDPA_SIM_NET=m
CONFIG_VDPA_USER=m
diff --git a/kernel.spec b/kernel.spec
index a25ebfbd5..df351fd0c 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.14
+%define rpmversion 5.16.15
%define patchversion 5.16
%define pkgrelease 100
@@ -692,7 +692,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16.14.tar.xz
+Source0: linux-5.16.15.tar.xz
Source1: Makefile.rhelver
@@ -1386,8 +1386,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16.14 -c
-mv linux-5.16.14 linux-%{KVERREL}
+%setup -q -n kernel-5.16.15 -c
+mv linux-5.16.15 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2985,8 +2985,14 @@ fi
#
#
%changelog
+* Wed Mar 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.15-0]
+- nfc: st21nfca: Fix potential buffer overflows in EVT_TRANSACTION (Jordy Zomer)
+- Restrict FS_LOCATIONS to NFS v4.2+ to work around Qnap knfsd-3.4.6 bug (Justin M. Forbes)
+- Turn on VDPA_SIM_BLOCK (Justin M. Forbes)
+- Fix up changelog (Justin M. Forbes)
+
* Fri Mar 11 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.14-0]
-- Linux v5.16.14
+- Linux v5.16.14 (Justin M. Forbes)
* Tue Mar 08 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.16.13-0]
- Add config for ARM64_ERRATUM_2077057 (Justin M. Forbes)
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index 7110a8e5c..4a6334deb 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -16,8 +16,6 @@
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/efi.c | 124 +++++++++++++++------
drivers/firmware/efi/secureboot.c | 38 +++++++
- drivers/gpu/drm/i915/display/intel_psr.c | 16 ++-
- drivers/gpu/drm/i915/i915_reg.h | 1 +
drivers/gpu/drm/nouveau/nouveau_backlight.c | 3 +-
drivers/hid/hid-rmi.c | 64 -----------
drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++
@@ -27,12 +25,14 @@
drivers/net/wireless/ath/ath11k/core.h | 1 +
drivers/net/wireless/ath/ath11k/mhi.c | 1 +
drivers/net/wireless/ath/ath11k/pci.c | 16 ++-
+ drivers/nfc/st21nfca/se.c | 10 ++
drivers/nvme/host/core.c | 22 +++-
drivers/nvme/host/multipath.c | 19 ++--
drivers/nvme/host/nvme.h | 4 +
drivers/pci/msi.c | 13 +--
drivers/pci/quirks.c | 24 ++++
drivers/usb/core/hub.c | 7 ++
+ fs/nfs/nfs4proc.c | 7 +-
include/linux/efi.h | 22 ++--
include/linux/lsm_hook_defs.h | 2 +
include/linux/lsm_hooks.h | 6 +
@@ -49,10 +49,10 @@
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
tools/testing/selftests/netfilter/nft_nat.sh | 5 +-
- 51 files changed, 811 insertions(+), 205 deletions(-)
+ 51 files changed, 810 insertions(+), 206 deletions(-)
diff --git a/Makefile b/Makefile
-index 86835419075f..dd0dae5bea09 100644
+index 8675dd2a9cc8..fae0fa3f7ed5 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -83,7 +83,7 @@ index c2724d986fa0..8063dcef65f7 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 0e2c31f7a9aa..25310b3a1fc6 100644
+index d05d94d2b28b..1dfcaaba8810 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1109,7 +1109,7 @@ endchoice
@@ -95,7 +95,7 @@ index 0e2c31f7a9aa..25310b3a1fc6 100644
help
For systems with 52-bit userspace VAs enabled, the kernel will attempt
to maintain compatibility with older software by providing 48-bit VAs
-@@ -1363,6 +1363,7 @@ config XEN
+@@ -1360,6 +1360,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
@@ -151,7 +151,7 @@ index 65a31cb0611f..5d059341f02b 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index e04f5e6eb33f..8015e3d2dc9a 100644
+index 1782b3fb9320..d4b69f672bec 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -20,6 +20,7 @@
@@ -162,7 +162,7 @@ index e04f5e6eb33f..8015e3d2dc9a 100644
#include <linux/usb/xhci-dbgp.h>
#include <linux/static_call.h>
#include <linux/swiotlb.h>
-@@ -929,6 +930,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -949,6 +950,13 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();
@@ -176,7 +176,7 @@ index e04f5e6eb33f..8015e3d2dc9a 100644
dmi_setup();
/*
-@@ -1094,19 +1102,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1114,19 +1122,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
@@ -850,59 +850,6 @@ index 000000000000..de0a3714a5d4
+ }
+ }
+}
-diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
-index 7a205fd5023b..3ba8b717e176 100644
---- a/drivers/gpu/drm/i915/display/intel_psr.c
-+++ b/drivers/gpu/drm/i915/display/intel_psr.c
-@@ -1400,6 +1400,13 @@ static inline u32 man_trk_ctl_single_full_frame_bit_get(struct drm_i915_private
- PSR2_MAN_TRK_CTL_SF_SINGLE_FULL_FRAME;
- }
-
-+static inline u32 man_trk_ctl_partial_frame_bit_get(struct drm_i915_private *dev_priv)
-+{
-+ return IS_ALDERLAKE_P(dev_priv) ?
-+ ADLP_PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE :
-+ PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE;
-+}
-+
- static void psr_force_hw_tracking_exit(struct intel_dp *intel_dp)
- {
- struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
-@@ -1495,7 +1502,13 @@ static void psr2_man_trk_ctl_calc(struct intel_crtc_state *crtc_state,
- {
- struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
- struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-- u32 val = PSR2_MAN_TRK_CTL_ENABLE;
-+ u32 val = 0;
-+
-+ if (!IS_ALDERLAKE_P(dev_priv))
-+ val = PSR2_MAN_TRK_CTL_ENABLE;
-+
-+ /* SF partial frame enable has to be set even on full update */
-+ val |= man_trk_ctl_partial_frame_bit_get(dev_priv);
-
- if (full_update) {
- /*
-@@ -1515,7 +1528,6 @@ static void psr2_man_trk_ctl_calc(struct intel_crtc_state *crtc_state,
- } else {
- drm_WARN_ON(crtc_state->uapi.crtc->dev, clip->y1 % 4 || clip->y2 % 4);
-
-- val |= PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE;
- val |= PSR2_MAN_TRK_CTL_SU_REGION_START_ADDR(clip->y1 / 4 + 1);
- val |= PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR(clip->y2 / 4 + 1);
- }
-diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
-index 14ce8809efdd..e927776ae183 100644
---- a/drivers/gpu/drm/i915/i915_reg.h
-+++ b/drivers/gpu/drm/i915/i915_reg.h
-@@ -4738,6 +4738,7 @@ enum {
- #define ADLP_PSR2_MAN_TRK_CTL_SU_REGION_START_ADDR(val) REG_FIELD_PREP(ADLP_PSR2_MAN_TRK_CTL_SU_REGION_START_ADDR_MASK, val)
- #define ADLP_PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR_MASK REG_GENMASK(12, 0)
- #define ADLP_PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR(val) REG_FIELD_PREP(ADLP_PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR_MASK, val)
-+#define ADLP_PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE REG_BIT(31)
- #define ADLP_PSR2_MAN_TRK_CTL_SF_SINGLE_FULL_FRAME REG_BIT(14)
- #define ADLP_PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME REG_BIT(13)
-
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 1cbd71abc80a..9d2513de959b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -1422,6 +1369,34 @@ index 4c348bacf2cb..9fe496d35b38 100644
dev_err(&pdev->dev, "Unsupported WCN6855 SOC hardware version: %d %d\n",
soc_hw_version_major, soc_hw_version_minor);
ret = -EOPNOTSUPP;
+diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c
+index a43fc4117fa5..c922f10d0d7b 100644
+--- a/drivers/nfc/st21nfca/se.c
++++ b/drivers/nfc/st21nfca/se.c
+@@ -316,6 +316,11 @@ int st21nfca_connectivity_event_received(struct nfc_hci_dev *hdev, u8 host,
+ return -ENOMEM;
+
+ transaction->aid_len = skb->data[1];
++
++ /* Checking if the length of the AID is valid */
++ if (transaction->aid_len > sizeof(transaction->aid))
++ return -EINVAL;
++
+ memcpy(transaction->aid, &skb->data[2],
+ transaction->aid_len);
+
+@@ -325,6 +330,11 @@ int st21nfca_connectivity_event_received(struct nfc_hci_dev *hdev, u8 host,
+ return -EPROTO;
+
+ transaction->params_len = skb->data[transaction->aid_len + 3];
++
++ /* Total size is allocated (skb->len - 2) minus fixed array members */
++ if (transaction->params_len > ((skb->len - 2) - sizeof(struct nfc_evt_transaction)))
++ return -EINVAL;
++
+ memcpy(transaction->params, skb->data +
+ transaction->aid_len + 4, transaction->params_len);
+
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 5785f6abf194..7fc5f15a4b78 100644
--- a/drivers/nvme/host/core.c
@@ -1590,7 +1565,7 @@ index 8465221be6d2..64f37ad8227d 100644
pcibios_free_irq(dev);
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 20a932690738..494cee3aec7b 100644
+index db864bf634a3..0489be6c81d4 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -4272,6 +4272,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
@@ -1642,6 +1617,31 @@ index ac6c5ccfe1cb..ec784479eece 100644
/* Lock the device, then check to see if we were
* disconnected while waiting for the lock to succeed. */
usb_lock_device(hdev);
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index 0abbbf5d2bdf..c216bbf7ee75 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -3859,8 +3859,8 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
+ res.attr_bitmask[2] &= FATTR4_WORD2_NFS42_MASK;
+ }
+ memcpy(server->attr_bitmask, res.attr_bitmask, sizeof(server->attr_bitmask));
+- server->caps &= ~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS |
+- NFS_CAP_SYMLINKS| NFS_CAP_SECURITY_LABEL);
++ server->caps &= ~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS
++ | NFS_CAP_SECURITY_LABEL | NFS_CAP_FS_LOCATIONS);
+ server->fattr_valid = NFS_ATTR_FATTR_V4;
+ if (res.attr_bitmask[0] & FATTR4_WORD0_ACL &&
+ res.acl_bitmask & ACL4_SUPPORT_ALLOW_ACL)
+@@ -3873,7 +3873,8 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
+ if (res.attr_bitmask[2] & FATTR4_WORD2_SECURITY_LABEL)
+ server->caps |= NFS_CAP_SECURITY_LABEL;
+ #endif
+- if (res.attr_bitmask[0] & FATTR4_WORD0_FS_LOCATIONS)
++ /* Restrict FS_LOCATIONS to NFS v4.2+ to work around Qnap knfsd-3.4.6 bug */
++ if (res.attr_bitmask[0] & FATTR4_WORD0_FS_LOCATIONS && minorversion >= 2)
+ server->caps |= NFS_CAP_FS_LOCATIONS;
+ if (!(res.attr_bitmask[0] & FATTR4_WORD0_FILEID))
+ server->fattr_valid &= ~NFS_ATTR_FATTR_FILEID;
diff --git a/include/linux/efi.h b/include/linux/efi.h
index ef8dbc0a1522..836a5dfc6156 100644
--- a/include/linux/efi.h
diff --git a/sources b/sources
index 44e2d5495..a65680cb7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16.14.tar.xz) = 5f7320756f4291f2292cb1ba1230dd57055784964bba5c82dbdeca3139793cc0bff8a5bf526087b3299344dde2ab5912ab411e24e8f4c812baa830b63bae0a7c
-SHA512 (kernel-abi-stablelists-5.16.14-100.tar.bz2) = 668ee69954840f5c4d5a5f35866ac4057bf90139ad3fcdb9195347b1facdc8dfb979d7e3570a58aa5b5c25cc7515905a38562cc2906b203dd51ef5de8eb287c4
-SHA512 (kernel-kabi-dw-5.16.14-100.tar.bz2) = babc378940a56a33b64bf7e4951430743e49158a94c276c7d1b81fb5ee4d5fd45c189d1b2b461f5c445a19fc9fd0f1c82a37f6cdf49ce13c9510b54cb4a642d0
+SHA512 (linux-5.16.15.tar.xz) = 2bb60417bfcff772de12419a4279eb21139871cad5cd800e295832b646f75b2e751115dda1ceb8344465a1f263a782f7e6dc45362433caf7bab3c164b7f78d7f
+SHA512 (kernel-abi-stablelists-5.16.15-100.tar.bz2) = 9fa1a6aba3b11b63dd461cd10af1269e8354aa7df39f02ea7d2e36ec86aa7f115ea54779001bc6ce3f8e37040a03d34ccfad762684b9a1ac0a71bde8369e6a67
+SHA512 (kernel-kabi-dw-5.16.15-100.tar.bz2) = 7a07aa18af068537bd31ed63bdd796d3bc7510ad29bb5428546bbaa93a866aea193ba127058904f9fc257c01b2fb072b8d27f2ac8b845e483d7e92b0e4f4deca