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

Changed files
+11 -17
drivers
lib
+5 -4
.mailmap
··· 337 337 Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org> 338 338 Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org> 339 339 Kay Sievers <kay.sievers@vrfy.org> 340 - Kees Cook <keescook@chromium.org> <kees.cook@canonical.com> 341 - Kees Cook <keescook@chromium.org> <keescook@google.com> 342 - Kees Cook <keescook@chromium.org> <kees@outflux.net> 343 - Kees Cook <keescook@chromium.org> <kees@ubuntu.com> 340 + Kees Cook <kees@kernel.org> <kees.cook@canonical.com> 341 + Kees Cook <kees@kernel.org> <keescook@chromium.org> 342 + Kees Cook <kees@kernel.org> <keescook@google.com> 343 + Kees Cook <kees@kernel.org> <kees@outflux.net> 344 + Kees Cook <kees@kernel.org> <kees@ubuntu.com> 344 345 Keith Busch <kbusch@kernel.org> <keith.busch@intel.com> 345 346 Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com> 346 347 Kenneth W Chen <kenneth.w.chen@intel.com>
+1 -1
drivers/scsi/mpt3sas/mpt3sas_base.c
··· 4774 4774 char desc[17] = {0}; 4775 4775 u32 iounit_pg1_flags; 4776 4776 4777 - strscpy(desc, ioc->manu_pg0.ChipName, sizeof(desc)); 4777 + memtostr(desc, ioc->manu_pg0.ChipName); 4778 4778 ioc_info(ioc, "%s: FWVersion(%02d.%02d.%02d.%02d), ChipRevision(0x%02x)\n", 4779 4779 desc, 4780 4780 (ioc->facts.FWVersion.Word & 0xFF000000) >> 24,
+5 -9
drivers/scsi/mpt3sas/mpt3sas_transport.c
··· 458 458 goto out; 459 459 460 460 manufacture_reply = data_out + sizeof(struct rep_manu_request); 461 - strscpy(edev->vendor_id, manufacture_reply->vendor_id, 462 - sizeof(edev->vendor_id)); 463 - strscpy(edev->product_id, manufacture_reply->product_id, 464 - sizeof(edev->product_id)); 465 - strscpy(edev->product_rev, manufacture_reply->product_rev, 466 - sizeof(edev->product_rev)); 461 + memtostr(edev->vendor_id, manufacture_reply->vendor_id); 462 + memtostr(edev->product_id, manufacture_reply->product_id); 463 + memtostr(edev->product_rev, manufacture_reply->product_rev); 467 464 edev->level = manufacture_reply->sas_format & 1; 468 465 if (edev->level) { 469 - strscpy(edev->component_vendor_id, 470 - manufacture_reply->component_vendor_id, 471 - sizeof(edev->component_vendor_id)); 466 + memtostr(edev->component_vendor_id, 467 + manufacture_reply->component_vendor_id); 472 468 tmp = (u8 *)&manufacture_reply->component_id; 473 469 edev->component_id = tmp[0] << 8 | tmp[1]; 474 470 edev->component_revision_id =
-3
lib/fortify_kunit.c
··· 236 236 kfree(p)); \ 237 237 checker(expected_size, __kmalloc(alloc_size, gfp), \ 238 238 kfree(p)); \ 239 - checker(expected_size, \ 240 - __kmalloc_node(alloc_size, gfp, NUMA_NO_NODE), \ 241 - kfree(p)); \ 242 239 \ 243 240 orig = kmalloc(alloc_size, gfp); \ 244 241 KUNIT_EXPECT_TRUE(test, orig != NULL); \