kernel-6.0.1-300

* Wed Oct 12 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.1-0]
- scsi: stex: Properly zero out the passthrough command structure (Linus Torvalds)
- ipv4: Handle attempt to delete multipath route when fib_info contains an nh reference (David Ahern)
- Turn E1000 back on (Justin M. Forbes)
- Linux v6.0.1
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

4 files changed, 103 insertions, 9 deletions

diff --git a/Patchlist.changelog b/Patchlist.changelog
index 08898450f..34e57d567 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/85410346efac67acc97d156063d5ec39bf985124
+ 85410346efac67acc97d156063d5ec39bf985124 scsi: stex: Properly zero out the passthrough command structure
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/dce543dfaac7d80c338ed21ccd2543aaf5d7b85a
+ dce543dfaac7d80c338ed21ccd2543aaf5d7b85a ipv4: Handle attempt to delete multipath route when fib_info contains an nh reference
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/0988b1d9ca90040134efda1f36af93a0b90d42b2
  0988b1d9ca90040134efda1f36af93a0b90d42b2 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
 
diff --git a/kernel.spec b/kernel.spec
index bc855d459..086e39f90 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -122,17 +122,17 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specversion 6.0.0
+%define specversion 6.0.1
 %define patchversion 6.0
 %define pkgrelease 300
 %define kversion 6
-%define tarfile_release 6.0
+%define tarfile_release 6.0.1
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 300%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.0.0
+%define kabiversion 6.0.1
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3180,8 +3180,11 @@ fi
 #
 #
 %changelog
-* Wed Oct 05 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.0-300]
+* Wed Oct 12 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.1-0]
+- scsi: stex: Properly zero out the passthrough command structure (Linus Torvalds)
+- ipv4: Handle attempt to delete multipath route when fib_info contains an nh reference (David Ahern)
 - Turn E1000 back on (Justin M. Forbes)
+- Linux v6.0.1
 
 * Wed Oct 05 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.0-0]
 - enable efifb for Nvidia (Justin M. Forbes)
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index ccaf0a057..1c3b214d2 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -24,23 +24,27 @@
  drivers/nvme/host/multipath.c                      |  19 ++--
  drivers/nvme/host/nvme.h                           |   4 +
  drivers/pci/quirks.c                               |  24 ++++
+ drivers/scsi/stex.c                                |  17 +--
  drivers/usb/core/hub.c                             |   7 ++
  include/linux/efi.h                                |  22 ++--
  include/linux/lsm_hook_defs.h                      |   2 +
  include/linux/lsm_hooks.h                          |   6 +
  include/linux/rmi.h                                |   1 +
  include/linux/security.h                           |   5 +
+ include/scsi/scsi_cmnd.h                           |   2 +-
  init/Kconfig                                       |   2 +-
  kernel/module/signing.c                            |   9 +-
+ net/ipv4/fib_semantics.c                           |   8 +-
  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 +
- 39 files changed, 508 insertions(+), 187 deletions(-)
+ tools/testing/selftests/net/fib_nexthops.sh        |   5 +
+ 43 files changed, 527 insertions(+), 200 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 8478e13e9424..9179a4f53267 100644
+index 3193969f1eb3..f6857e4cdb25 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1167,6 +1171,36 @@ index 4944798e75b5..079a29ef1bf2 100644
  /*
   * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
   * class code.  Fix it.
+diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
+index e6420f2127ce..8def242675ef 100644
+--- a/drivers/scsi/stex.c
++++ b/drivers/scsi/stex.c
+@@ -665,16 +665,17 @@ static int stex_queuecommand_lck(struct scsi_cmnd *cmd)
+ 		return 0;
+ 	case PASSTHRU_CMD:
+ 		if (cmd->cmnd[1] == PASSTHRU_GET_DRVVER) {
+-			struct st_drvver ver;
++			const struct st_drvver ver = {
++				.major = ST_VER_MAJOR,
++				.minor = ST_VER_MINOR,
++				.oem = ST_OEM,
++				.build = ST_BUILD_VER,
++				.signature[0] = PASSTHRU_SIGNATURE,
++				.console_id = host->max_id - 1,
++				.host_no = hba->host->host_no,
++			};
+ 			size_t cp_len = sizeof(ver);
+
+-			ver.major = ST_VER_MAJOR;
+-			ver.minor = ST_VER_MINOR;
+-			ver.oem = ST_OEM;
+-			ver.build = ST_BUILD_VER;
+-			ver.signature[0] = PASSTHRU_SIGNATURE;
+-			ver.console_id = host->max_id - 1;
+-			ver.host_no = hba->host->host_no;
+ 			cp_len = scsi_sg_copy_from_buffer(cmd, &ver, cp_len);
+ 			if (sizeof(ver) == cp_len)
+ 				cmd->result = DID_OK << 16;
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
 index bbab424b0d55..ed86042fb57b 100644
 --- a/drivers/usb/core/hub.c
@@ -1318,6 +1352,19 @@ index 7bd0c490703d..7779eaf1ffa1 100644
  #endif	/* CONFIG_SECURITY */
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
+diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
+index bac55decf900..7d3622db38ed 100644
+--- a/include/scsi/scsi_cmnd.h
++++ b/include/scsi/scsi_cmnd.h
+@@ -201,7 +201,7 @@ static inline unsigned int scsi_get_resid(struct scsi_cmnd *cmd)
+ 	for_each_sg(scsi_sglist(cmd), sg, nseg, __i)
+
+ static inline int scsi_sg_copy_from_buffer(struct scsi_cmnd *cmd,
+-					   void *buf, int buflen)
++					   const void *buf, int buflen)
+ {
+ 	return sg_copy_from_buffer(scsi_sglist(cmd), scsi_sg_count(cmd),
+ 				   buf, buflen);
 diff --git a/init/Kconfig b/init/Kconfig
 index 532362fcfe31..30d547537ea0 100644
 --- a/init/Kconfig
@@ -1354,6 +1401,28 @@ 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/scripts/tags.sh b/scripts/tags.sh
 index e137cf15aae9..2ed2341f7967 100755
 --- a/scripts/tags.sh
@@ -1444,3 +1513,19 @@ 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()
diff --git a/sources b/sources
index 5ba0773c8..d962746f3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (kernel-abi-whitelists-5.13.3-300.tar.bz2) = 6bf4f456ba178ec95b63b3818d3575773ede221e74fde97bb20eb32409a64c58d4f9a6acce9b8b58a5477d27cb708c53abe03dada02a3bdf1cfd596ccd129294
-SHA512 (linux-6.0.tar.xz) = b0f06f089c2ff42b59038c14f3d2b26f2f5510eda13057261239a3cb8fdea0c114e76842dd9676ed4187820ac9af8018ef0d2ca18a4507a3bf3cd47c9aba7b56
-SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = d8c014b9656350d5facb370ad2e066a55d689660da6acc45ad31f9fce814708fde424597f91572aa2fc1691f48911220fe643d7f1a79b21db35c2a4249fdeae4
-SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = ddee497fc356ccc0633b7f9cb26906bb7751828427f9a712d37748d786d39e6ad7894f58560d762a6d0ca28a0289a24638fe4bd69eeb92427bb0ee4e7fdc7271
+SHA512 (linux-6.0.1.tar.xz) = 6e9c7eccf5c54407b20bf3b006757f7e163485c9064e877c6b5415122befbdc8f486cfd1e6817ef232617db5fa30776468bcd3a390f3892e0246c2dac9d9126a
+SHA512 (kernel-abi-stablelists-6.0.1.tar.bz2) = 837228c1b6e13fec3b201c3cd81518e25b0e03f62894376c8661d9279f6e1e4afa39f64f9beb3fa84bee43231fbe4cb9c24a979b9f9a3ea8063db469f04db133
+SHA512 (kernel-kabi-dw-6.0.1.tar.bz2) = de96f3b6fe82c48d87406128194dbfe137eda9b9060b613eb1f3808ce6be772a6af8153802190b94a123e8c8b880dd0a082a1979b1e57ba91f8cee7fa9991fdd