summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-08-21 17:36:14 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2022-08-21 17:36:14 +0200
commit5ad5f66aeeea03e5658cef955a6572f277d9e956 (patch)
tree724f2d8235af9f0d899e2ffe723f1d1f80818d8c
parent550cee95348da58af0a49b53202a3b3fa47c5ff3 (diff)
parent070982a3541ea432ed8380bde861a230215c4d5f (diff)
downloadkernel-5.18.19-250.vanilla.1.fc36.tar.gz
kernel-5.18.19-250.vanilla.1.fc36.tar.xz
kernel-5.18.19-250.vanilla.1.fc36.zip
-rw-r--r--Patchlist.changelog6
-rw-r--r--kernel-aarch64-debug-fedora.config3
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-fedora.config3
-rw-r--r--kernel-aarch64-rhel.config1
-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-x86_64-debug-fedora.config3
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-fedora.config3
-rw-r--r--kernel-x86_64-rhel.config2
-rwxr-xr-xkernel.spec14
-rw-r--r--patch-5.18-redhat.patch177
-rw-r--r--sources6
16 files changed, 73 insertions, 156 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 78dcd535a..58930ed93 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3b823933997c2c3eb7970ec0ec30da4be1940df7
+ 3b823933997c2c3eb7970ec0ec30da4be1940df7 Bluetooth: hci_event: Fix vendor (unknown) opcode status handling
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/3acea40142fded80fd2282e48520b4ba0d7ba03a
+ 3acea40142fded80fd2282e48520b4ba0d7ba03a Bluetooth: hci_sync: Fix resuming scan after suspend resume
+
"https://gitlab.com/cki-project/kernel-ark/-/commit"/9602f79ee66be0de1e67917bfc95252c6e596a9c
9602f79ee66be0de1e67917bfc95252c6e596a9c netfilter: nf_tables: do not allow RULE_ID to refer to another chain
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 62579649d..880e0459d 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -346,6 +346,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1742098=y
CONFIG_ARM64_ERRATUM_1902691=y
CONFIG_ARM64_ERRATUM_2038923=y
# CONFIG_ARM64_ERRATUM_2051678 is not set
@@ -1304,7 +1305,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B_NEON=m
CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_BLAKE2S_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
CONFIG_CRYPTO_BLAKE2S=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 2d8210014..3bc26af95 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -274,6 +274,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1742098=y
CONFIG_ARM64_ERRATUM_1902691=y
CONFIG_ARM64_ERRATUM_2038923=y
CONFIG_ARM64_ERRATUM_2051678=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 65ae1a216..bd033eaf6 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -346,6 +346,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1742098=y
CONFIG_ARM64_ERRATUM_1902691=y
CONFIG_ARM64_ERRATUM_2038923=y
# CONFIG_ARM64_ERRATUM_2051678 is not set
@@ -1304,7 +1305,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B_NEON=m
CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_BLAKE2S_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
CONFIG_CRYPTO_BLAKE2S=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 609e2c886..5bfc66c7f 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -274,6 +274,7 @@ CONFIG_ARM64_ERRATUM_1463225=y
CONFIG_ARM64_ERRATUM_1508412=y
CONFIG_ARM64_ERRATUM_1530923=y
CONFIG_ARM64_ERRATUM_1542419=y
+CONFIG_ARM64_ERRATUM_1742098=y
CONFIG_ARM64_ERRATUM_1902691=y
CONFIG_ARM64_ERRATUM_2038923=y
CONFIG_ARM64_ERRATUM_2051678=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index ad16845b3..d246047c8 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1293,7 +1293,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B_NEON=m
CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_BLAKE2S_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
CONFIG_CRYPTO_BLAKE2S=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 1f3e7b358..97f13dcea 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1293,7 +1293,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B_NEON=m
CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_BLAKE2S_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
CONFIG_CRYPTO_BLAKE2S=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index fcf57993e..a80fee261 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1265,7 +1265,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B_NEON=m
CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_BLAKE2S_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
CONFIG_CRYPTO_BLAKE2S=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 6c59d3a6d..c3d95b8b2 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1265,7 +1265,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B_NEON=m
CONFIG_CRYPTO_BLAKE2B=y
-CONFIG_CRYPTO_BLAKE2S_ARM=m
+CONFIG_CRYPTO_BLAKE2S_ARM=y
CONFIG_CRYPTO_BLAKE2S=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_CAMELLIA=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 466da3dfd..a09ae5402 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1068,7 +1068,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=y
CONFIG_CRYPTO_BLAKE2S=m
-CONFIG_CRYPTO_BLAKE2S_X86=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
@@ -7945,6 +7945,7 @@ CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_XEN_SYMS=y
CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
+CONFIG_XEN_VIRTIO_FORCE_GRANT=y
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index c12d2377c..27378506c 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -864,7 +864,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m
# CONFIG_CRYPTO_BLAKE2S is not set
-CONFIG_CRYPTO_BLAKE2S_X86=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index fe9c8e1b9..a155a544f 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1067,7 +1067,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=y
CONFIG_CRYPTO_BLAKE2S=m
-CONFIG_CRYPTO_BLAKE2S_X86=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
@@ -7923,6 +7923,7 @@ CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_XEN_SYMS=y
CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
+CONFIG_XEN_VIRTIO_FORCE_GRANT=y
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index d64a61113..68db030de 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -864,7 +864,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_BLAKE2B=m
# CONFIG_CRYPTO_BLAKE2S is not set
-CONFIG_CRYPTO_BLAKE2S_X86=m
+CONFIG_CRYPTO_BLAKE2S_X86=y
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_BLOWFISH_X86_64=m
CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
diff --git a/kernel.spec b/kernel.spec
index 070f31f35..22340db81 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -102,7 +102,7 @@ Summary: The Linux kernel
%else
%define primary_target rhel
%endif
-%define fedorabase 5.18.17
+%define fedorabase 5.18.19
#
# genspec.sh variables
@@ -127,11 +127,11 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
-%define specversion 5.18.18
+%define specversion 5.18.19
%define patchversion 5.18
%define pkgrelease 200
%define kversion 5
-%define tarfile_release 5.18.18
+%define tarfile_release 5.18.19
# This is needed to do merge window version magic
%define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag
@@ -3041,6 +3041,14 @@ fi
#
#
%changelog
+
+* Sun Aug 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.19-200]
+- v5.18.19 rebase
+* Wed Aug 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.18-0]
+- Config updates for 5.19.2 (Justin M. Forbes)
+- Bluetooth: hci_event: Fix vendor (unknown) opcode status handling (Hans de Goede)
+- Bluetooth: hci_sync: Fix resuming scan after suspend resume (Zhengping Jiang)
+
* Thu Aug 11 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.18.17-0]
- netfilter: nf_tables: do not allow RULE_ID to refer to another chain (Thadeu Lima de Souza Cascardo)
- netfilter: nf_tables: do not allow CHAIN_ID to refer to another table (Thadeu Lima de Souza Cascardo)
diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch
index c9afbe732..3a17c970a 100644
--- a/patch-5.18-redhat.patch
+++ b/patch-5.18-redhat.patch
@@ -30,7 +30,6 @@
drivers/nvme/host/nvme.h | 4 +
drivers/pci/quirks.c | 24 ++++
drivers/usb/core/hub.c | 7 ++
- fs/exec.c | 3 +
include/linux/efi.h | 24 ++--
include/linux/lsm_hook_defs.h | 2 +
include/linux/lsm_hooks.h | 6 +
@@ -38,17 +37,16 @@
include/linux/security.h | 5 +
init/Kconfig | 2 +-
kernel/module_signing.c | 9 +-
- net/netfilter/nf_tables_api.c | 17 ++-
- net/sched/cls_route.c | 2 +-
+ net/bluetooth/hci_event.c | 20 ++++
scripts/tags.sh | 2 +
security/integrity/platform_certs/load_uefi.c | 6 +-
security/lockdown/Kconfig | 13 +++
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 47 files changed, 737 insertions(+), 197 deletions(-)
+ 45 files changed, 741 insertions(+), 191 deletions(-)
diff --git a/Makefile b/Makefile
-index ef8c18e5c161..81900a28f77b 100644
+index fc7efcdab0a2..bdaea37d0246 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -79,10 +77,10 @@ index 2e8091e2d8a8..32e0403314b1 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 20ea89d9ac2f..774c1a05152d 100644
+index 54cf6faf339c..c513485d3351 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -1126,7 +1126,7 @@ endchoice
+@@ -1143,7 +1143,7 @@ endchoice
config ARM64_FORCE_52BIT
bool "Force 52-bit virtual addresses for userspace"
@@ -91,7 +89,7 @@ index 20ea89d9ac2f..774c1a05152d 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
-@@ -1365,6 +1365,7 @@ config XEN
+@@ -1382,6 +1382,7 @@ config XEN
config FORCE_MAX_ZONEORDER
int
default "14" if ARM64_64K_PAGES
@@ -1331,7 +1329,7 @@ index 857d4c2fd1a2..9353941f3a97 100644
* Changes the default domain of an iommu group that has *only* one device
*
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index c9831daafbc6..5c4bb1e9ba0a 100644
+index a58a69999dbc..bf2a917f12b4 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1398,7 +1396,7 @@ index c9831daafbc6..5c4bb1e9ba0a 100644
}
EXPORT_SYMBOL_GPL(nvme_complete_rq);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index d464fdf978fb..acdaab3d7697 100644
+index b0fe23439c4a..65aa285034f7 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys)
@@ -1434,7 +1432,7 @@ index d464fdf978fb..acdaab3d7697 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -869,8 +875,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -870,8 +876,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
int error = 0;
/* check if multipath is enabled and we have the capability */
@@ -1519,20 +1517,6 @@ index 1460857026e0..7e1964891089 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/exec.c b/fs/exec.c
-index 5a75e92b1a0a..a9f5acf8f0ec 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1297,6 +1297,9 @@ int begin_new_exec(struct linux_binprm * bprm)
- bprm->mm = NULL;
-
- #ifdef CONFIG_POSIX_TIMERS
-+ spin_lock_irq(&me->sighand->siglock);
-+ posix_cpu_timers_exit(me);
-+ spin_unlock_irq(&me->sighand->siglock);
- exit_itimers(me);
- flush_itimer_signals();
- #endif
diff --git a/include/linux/efi.h b/include/linux/efi.h
index cc6d2be2ffd5..418d814d2eb7 100644
--- a/include/linux/efi.h
@@ -1716,124 +1700,37 @@ index 8723ae70ea1f..fb2d773498c2 100644
+ }
+ return ret;
}
-diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
-index de3dc35ce609..30dd77d58f20 100644
---- a/net/netfilter/nf_tables_api.c
-+++ b/net/netfilter/nf_tables_api.c
-@@ -2472,6 +2472,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,
- }
-
- static struct nft_chain *nft_chain_lookup_byid(const struct net *net,
-+ const struct nft_table *table,
- const struct nlattr *nla)
- {
- struct nftables_pernet *nft_net = nft_pernet(net);
-@@ -2482,6 +2483,7 @@ static struct nft_chain *nft_chain_lookup_byid(const struct net *net,
- struct nft_chain *chain = trans->ctx.chain;
-
- if (trans->msg_type == NFT_MSG_NEWCHAIN &&
-+ chain->table == table &&
- id == nft_trans_chain_id(trans))
- return chain;
- }
-@@ -3369,6 +3371,7 @@ static int nft_table_validate(struct net *net, const struct nft_table *table)
- }
-
- static struct nft_rule *nft_rule_lookup_byid(const struct net *net,
-+ const struct nft_chain *chain,
- const struct nlattr *nla);
-
- #define NFT_RULE_MAXEXPRS 128
-@@ -3415,7 +3418,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,
- return -EOPNOTSUPP;
-
- } else if (nla[NFTA_RULE_CHAIN_ID]) {
-- chain = nft_chain_lookup_byid(net, nla[NFTA_RULE_CHAIN_ID]);
-+ chain = nft_chain_lookup_byid(net, table, nla[NFTA_RULE_CHAIN_ID]);
- if (IS_ERR(chain)) {
- NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_CHAIN_ID]);
- return PTR_ERR(chain);
-@@ -3457,7 +3460,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,
- return PTR_ERR(old_rule);
- }
- } else if (nla[NFTA_RULE_POSITION_ID]) {
-- old_rule = nft_rule_lookup_byid(net, nla[NFTA_RULE_POSITION_ID]);
-+ old_rule = nft_rule_lookup_byid(net, chain, nla[NFTA_RULE_POSITION_ID]);
- if (IS_ERR(old_rule)) {
- NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_POSITION_ID]);
- return PTR_ERR(old_rule);
-@@ -3602,6 +3605,7 @@ static int nf_tables_newrule(struct sk_buff *skb, const struct nfnl_info *info,
- }
-
- static struct nft_rule *nft_rule_lookup_byid(const struct net *net,
-+ const struct nft_chain *chain,
- const struct nlattr *nla)
- {
- struct nftables_pernet *nft_net = nft_pernet(net);
-@@ -3612,6 +3616,7 @@ static struct nft_rule *nft_rule_lookup_byid(const struct net *net,
- struct nft_rule *rule = nft_trans_rule(trans);
-
- if (trans->msg_type == NFT_MSG_NEWRULE &&
-+ trans->ctx.chain == chain &&
- id == nft_trans_rule_id(trans))
- return rule;
+diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
+index 7cb956d3abb2..12df96177187 100644
+--- a/net/bluetooth/hci_event.c
++++ b/net/bluetooth/hci_event.c
+@@ -3997,6 +3997,26 @@ static void hci_cmd_complete_evt(struct hci_dev *hdev, void *data,
+ break;
+ }
}
-@@ -3661,7 +3666,7 @@ static int nf_tables_delrule(struct sk_buff *skb, const struct nfnl_info *info,
-
- err = nft_delrule(&ctx, rule);
- } else if (nla[NFTA_RULE_ID]) {
-- rule = nft_rule_lookup_byid(net, nla[NFTA_RULE_ID]);
-+ rule = nft_rule_lookup_byid(net, chain, nla[NFTA_RULE_ID]);
- if (IS_ERR(rule)) {
- NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_ID]);
- return PTR_ERR(rule);
-@@ -3840,6 +3845,7 @@ static struct nft_set *nft_set_lookup_byhandle(const struct nft_table *table,
- }
++ if (i == ARRAY_SIZE(hci_cc_table)) {
++ /* Unknown opcode, assume byte 0 contains the status, so
++ * that e.g. __hci_cmd_sync() properly returns errors
++ * for vendor specific commands send by HCI drivers.
++ *
++ * Note that the specification does not specify that
++ * byte 0 is the status:
++ *
++ * BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 4, Part E
++ * page 2189:
++ *
++ * Return_Parameters:
++ * Size: Depends on command
++ *
++ * For now using byte 0 seems to work fine, but in the future
++ * this may need to be updated so that drivers using vendor
++ * commands can specify their own completion handler.
++ */
++ *status = skb->data[0];
++ }
- static struct nft_set *nft_set_lookup_byid(const struct net *net,
-+ const struct nft_table *table,
- const struct nlattr *nla, u8 genmask)
- {
- struct nftables_pernet *nft_net = nft_pernet(net);
-@@ -3851,6 +3857,7 @@ static struct nft_set *nft_set_lookup_byid(const struct net *net,
- struct nft_set *set = nft_trans_set(trans);
-
- if (id == nft_trans_set_id(trans) &&
-+ set->table == table &&
- nft_active_genmask(set, genmask))
- return set;
- }
-@@ -3871,7 +3878,7 @@ struct nft_set *nft_set_lookup_global(const struct net *net,
- if (!nla_set_id)
- return set;
+ handle_cmd_cnt_and_timer(hdev, ev->ncmd);
-- set = nft_set_lookup_byid(net, nla_set_id, genmask);
-+ set = nft_set_lookup_byid(net, table, nla_set_id, genmask);
- }
- return set;
- }
-@@ -9595,7 +9602,7 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
- tb[NFTA_VERDICT_CHAIN],
- genmask);
- } else if (tb[NFTA_VERDICT_CHAIN_ID]) {
-- chain = nft_chain_lookup_byid(ctx->net,
-+ chain = nft_chain_lookup_byid(ctx->net, ctx->table,
- tb[NFTA_VERDICT_CHAIN_ID]);
- if (IS_ERR(chain))
- return PTR_ERR(chain);
-diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
-index a35ab8c27866..3f935cbbaff6 100644
---- a/net/sched/cls_route.c
-+++ b/net/sched/cls_route.c
-@@ -526,7 +526,7 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
- rcu_assign_pointer(f->next, f1);
- rcu_assign_pointer(*fp, f);
-
-- if (fold && fold->handle && f->handle != fold->handle) {
-+ if (fold) {
- th = to_hash(fold->handle);
- h = from_hash(fold->handle >> 16);
- b = rtnl_dereference(head->table[th]);
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 16d475b3e203..4e333f14b84e 100755
--- a/scripts/tags.sh
diff --git a/sources b/sources
index ca4db52f7..732b194f9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.18.17.tar.xz) = fb838f8f93faf83a41d9f42178c1ccd296d2a9e10fd1508f868e3e6d0bae4ebe2fb6ec2537cc3a6c955aec4520f402f53066e769c5be9244410fd3ae47b49faa
-SHA512 (kernel-abi-stablelists-5.18.17-200.tar.bz2) = 1bb833a38b5ac70988e69645bc18045f2df011652f48afb8f073ae393694fec024aaae0999cb606888d99bb010b135c415907c8068649c616a8d939e2b3a3206
-SHA512 (kernel-kabi-dw-5.18.17-200.tar.bz2) = a7bae8b6c6e312475257435f33510d725374b213998d439aaa786c68255871715c4d300738dd72d7eb943989f690e1c0fc73108c0ee329dd5c7f3da8d5239920
+SHA512 (linux-5.18.19.tar.xz) = d00394de14228d21e6e33e7c261c94809d6a5a285dede40e1e220ce20f0aa9137534850707cd2dd22c1f74997ae8a54827d47da4403c71081cf09095b12be758
+SHA512 (kernel-abi-stablelists-5.18.19-200.tar.bz2) = 6dae8eb230d452c5f9b18f2a159fc9bf65c6038b853d3b6b482caf9afba0f52381f94254a1420b0d99d205574da5f8c55cb02be7bc581f50c9b2f606469b309f
+SHA512 (kernel-kabi-dw-5.18.19-200.tar.bz2) = 9af3c9ee88fa176a12924766a9f6a9cf8c266e97cef0153d8b7c77257f7cf59f23f9682ad46d5c340a7307afc09726e4161c8ac24610075877f96ddea5d7a55b