Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

hardening fixes for v6.10-rc2-take2

Browse Source 
- scsi: mpt3sas: Avoid possible run-time warning with long manufacturer strings
 
 - mailmap: update entry for Kees Cook
 
 - kunit/fortify: Remove __kmalloc_node() test
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEpcP2jyKd1g9yPm4TiXL039xtwCYFAmZcHUMACgkQiXL039xt
 wCZJGhAAnUOrKhXV+ecnNzlegwbxfcXGpFA01RDSJ42e57lthiowj9/FmaxgzXSJ
 q6SkOX1lmbAJjIQ+glPM16DhWL1VhPUusVGiTTd36S+/YSb70gR7UX5cw3Vul0Qf
 K/BNNHA9kSw+Hl7w3FUkPwX6bnM0RVACdYifb80D0OoH+LnzOL78o6dtaf8YrPCq
 UU5is2NgpecuTJjn+MxzR90FGNrD9yACCXtGJn5nl+ONOTvQBUHtAfHeTCTlLe/Z
 7YH3q9c6FRtWSX/4uov6VrZoJFb7w+eQMOQanvcIECC7jJ8hSppR86f+NRshzitQ
 YQ5uww7/bdYf+4bu1nnuGunCRv/DdC1D+TX9taSridMyH//Wr+wRjd1SUinpGuZ8
 YoYTD+kEC8kKcpXowS1He0Zr66hgkNNhNyrGgwWpTK81J/Dkfok8WrdIz0tJFUOZ
 SkgK3/zhiRxIZQCNPzbouxOQMm/iZ1mUOmCAMoHGCTpgW3CgEgLmu1H7sYtZSgjy
 VR/HJ74MxNt/MPoyaDrmwigN6v+9m7TfRJSrFGCwTUb89nO6CQn9FDJNVL1Jn8T8
 4EkSLCpqI/txnSturKSvPVH1sAKKdw2p9UNaN2MXDhe168u3ii0Qi+o0Rbzje1Vk
 abnNT+DSVvRmTldmlQyo0VXORuwxqzKsa6BdRvArWDFyQCyM+Zw=
 =zA5i
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-06-02 09:15:28 -07:00
commit 00a8c352dd
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.mailmap
View File

@ -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>

2
drivers/scsi/mpt3sas/mpt3sas_base.c
View File

@ -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,

14
drivers/scsi/mpt3sas/mpt3sas_transport.c
View File

@ -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 =

3
lib/fortify_kunit.c
View File

@ -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); \