Commit 00a8c352 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hardening-v6.10-rc2-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull hardening fixes from Kees Cook:

 - scsi: mpt3sas: Avoid possible run-time warning with long manufacturer
   strings

 - mailmap: update entry for Kees Cook

 - kunit/fortify: Remove __kmalloc_node() test

* tag 'hardening-v6.10-rc2-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  kunit/fortify: Remove __kmalloc_node() test
  mailmap: update entry for Kees Cook
  scsi: mpt3sas: Avoid possible run-time warning with long manufacturer strings
parents 83814698 99a6087d

.mailmap

+5 −4
Original line number Diff line number Diff line
@@ -337,10 +337,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org> 
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>

Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>

Kay Sievers <kay.sievers@vrfy.org>

Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>

Kees Cook <keescook@chromium.org> <keescook@google.com>

Kees Cook <keescook@chromium.org> <kees@outflux.net>

Kees Cook <keescook@chromium.org> <kees@ubuntu.com>

Kees Cook <kees@kernel.org> <kees.cook@canonical.com>

Kees Cook <kees@kernel.org> <keescook@chromium.org>

Kees Cook <kees@kernel.org> <keescook@google.com>

Kees Cook <kees@kernel.org> <kees@outflux.net>

Kees Cook <kees@kernel.org> <kees@ubuntu.com>

Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

drivers/scsi/mpt3sas/mpt3sas_base.c

+1 −1
Original line number Diff line number Diff line
@@ -4774,7 +4774,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) 
	char desc[17] = {0};

	u32 iounit_pg1_flags;



	strscpy(desc, ioc->manu_pg0.ChipName, sizeof(desc));

	memtostr(desc, ioc->manu_pg0.ChipName);

	ioc_info(ioc, "%s: FWVersion(%02d.%02d.%02d.%02d), ChipRevision(0x%02x)\n",

		 desc,

		 (ioc->facts.FWVersion.Word & 0xFF000000) >> 24,

drivers/scsi/mpt3sas/mpt3sas_transport.c

+5 −9
Original line number Diff line number Diff line
@@ -458,17 +458,13 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc, 
			goto out;



		manufacture_reply = data_out + sizeof(struct rep_manu_request);

		strscpy(edev->vendor_id, manufacture_reply->vendor_id,

			sizeof(edev->vendor_id));

		strscpy(edev->product_id, manufacture_reply->product_id,

			sizeof(edev->product_id));

		strscpy(edev->product_rev, manufacture_reply->product_rev,

			sizeof(edev->product_rev));

		memtostr(edev->vendor_id, manufacture_reply->vendor_id);

		memtostr(edev->product_id, manufacture_reply->product_id);

		memtostr(edev->product_rev, manufacture_reply->product_rev);

		edev->level = manufacture_reply->sas_format & 1;

		if (edev->level) {

			strscpy(edev->component_vendor_id,

				manufacture_reply->component_vendor_id,

				sizeof(edev->component_vendor_id));

			memtostr(edev->component_vendor_id,

				 manufacture_reply->component_vendor_id);

			tmp = (u8 *)&manufacture_reply->component_id;

			edev->component_id = tmp[0] << 8 | tmp[1];

			edev->component_revision_id =

lib/fortify_kunit.c

+0 −3
Original line number Diff line number Diff line
@@ -235,9 +235,6 @@ static void fortify_test_alloc_size_##allocator##_dynamic(struct kunit *test) \ 
		kmalloc_array_node(alloc_size, 1, gfp, NUMA_NO_NODE),	\

		kfree(p));						\

	checker(expected_size, __kmalloc(alloc_size, gfp),		\

		kfree(p));						\

	checker(expected_size,						\

		__kmalloc_node(alloc_size, gfp, NUMA_NO_NODE),		\

		kfree(p));						\

									\

	orig = kmalloc(alloc_size, gfp);				\