aboutsummaryrefslogtreecommitdiff
path: root/SOURCES/patch-6.0-redhat.patch
diff options
context:
space:
mode:
authorJan200101 <sentrycraft123@gmail.com>2022-12-16 21:03:01 +0100
committerJan200101 <sentrycraft123@gmail.com>2022-12-16 21:03:01 +0100
commit98b9a029cfa590301cda089365e03ab02b03685c (patch)
treec4fad374979280a43967b823eff2f4bc1f2918b0 /SOURCES/patch-6.0-redhat.patch
parent8054bfb79431ccf6ca6446a053559c0900dbacb0 (diff)
downloadkernel-fsync-98b9a029cfa590301cda089365e03ab02b03685c.tar.gz
kernel-fsync-98b9a029cfa590301cda089365e03ab02b03685c.zip
kernel 6.0.12
Diffstat (limited to 'SOURCES/patch-6.0-redhat.patch')
-rw-r--r--SOURCES/patch-6.0-redhat.patch50
1 files changed, 5 insertions, 45 deletions
diff --git a/SOURCES/patch-6.0-redhat.patch b/SOURCES/patch-6.0-redhat.patch
index 97752a2..cb44e77 100644
--- a/SOURCES/patch-6.0-redhat.patch
+++ b/SOURCES/patch-6.0-redhat.patch
@@ -38,7 +38,6 @@
include/net/sock.h | 2 +-
init/Kconfig | 2 +-
kernel/module/signing.c | 9 +-
- net/ipv4/fib_semantics.c | 8 +-
net/l2tp/l2tp_core.c | 19 +-
scripts/pahole-flags.sh | 3 +
scripts/tags.sh | 2 +
@@ -46,11 +45,10 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- tools/testing/selftests/net/fib_nexthops.sh | 5 +
- 49 files changed, 776 insertions(+), 369 deletions(-)
+ 47 files changed, 767 insertions(+), 365 deletions(-)
diff --git a/Makefile b/Makefile
-index 9fecb094c28a..43753e41fb51 100644
+index 46c6eb57b354..ad3a206451ea 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1090,7 +1088,7 @@ index 3a808146b50f..c1a3f3057921 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 01c36284e542..2a5fd205863b 100644
+index f612a0ba64d0..5c4a1ca36aec 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1157,7 +1155,7 @@ index 01c36284e542..2a5fd205863b 100644
#ifdef CONFIG_NVME_AUTH
queue_work(nvme_wq, &ctrl->dhchap_auth_work);
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index b9cf17cbbbd5..9aa33fc59f67 100644
+index 114e2b9359f8..30049e986fba 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)
@@ -1193,7 +1191,7 @@ index b9cf17cbbbd5..9aa33fc59f67 100644
spin_lock_irqsave(&ns->head->requeue_lock, flags);
for (bio = req->bio; bio; bio = bio->bi_next) {
-@@ -872,8 +878,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
+@@ -875,8 +881,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 */
@@ -1995,28 +1993,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644
}
int module_sig_check(struct load_info *info, int flags)
-diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index 2dc97583d279..e9a7f70a54df 100644
---- a/net/ipv4/fib_semantics.c
-+++ b/net/ipv4/fib_semantics.c
-@@ -888,13 +888,13 @@ int fib_nh_match(struct net *net, struct fib_config *cfg, struct fib_info *fi,
- return 1;
- }
-
-+ /* cannot match on nexthop object attributes */
-+ if (fi->nh)
-+ return 1;
-+
- if (cfg->fc_oif || cfg->fc_gw_family) {
- struct fib_nh *nh;
-
-- /* cannot match on nexthop object attributes */
-- if (fi->nh)
-- return 1;
--
- nh = fib_info_nh(fi, 0);
- if (cfg->fc_encap) {
- if (fib_encap_match(net, cfg->fc_encap_type,
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 7499c51b1850..754fdda8a5f5 100644
--- a/net/l2tp/l2tp_core.c
@@ -2184,19 +2160,3 @@ index 4b95de24bc8d..10047790e96e 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
-diff --git a/tools/testing/selftests/net/fib_nexthops.sh b/tools/testing/selftests/net/fib_nexthops.sh
-index d5a0dd548989..ee5e98204d3d 100755
---- a/tools/testing/selftests/net/fib_nexthops.sh
-+++ b/tools/testing/selftests/net/fib_nexthops.sh
-@@ -1223,6 +1223,11 @@ ipv4_fcnal()
- log_test $rc 0 "Delete nexthop route warning"
- run_cmd "$IP route delete 172.16.101.1/32 nhid 12"
- run_cmd "$IP nexthop del id 12"
-+
-+ run_cmd "$IP nexthop add id 21 via 172.16.1.6 dev veth1"
-+ run_cmd "$IP ro add 172.16.101.0/24 nhid 21"
-+ run_cmd "$IP ro del 172.16.101.0/24 nexthop via 172.16.1.7 dev veth1 nexthop via 172.16.1.8 dev veth1"
-+ log_test $? 2 "Delete multipath route with only nh id based entry"
- }
-
- ipv4_grp_fcnal()