]> www.infradead.org Git - users/jedix/linux-maple.git/commit
scsi: ibmvscsi: Avoid multi-field memset() overflow by aiming at srp
authorKees Cook <keescook@chromium.org>
Mon, 21 Jun 2021 19:07:10 +0000 (12:07 -0700)
committerKees Cook <keescook@chromium.org>
Wed, 25 Aug 2021 15:38:39 +0000 (08:38 -0700)
commit57c0b5f92099b95a3faa7dc885f570cbca210ac3
tree54e351c39c8f8cf1863033fcb0fee7d9a64fa5e1
parent2734d6c1b1a089fb593ef6a23d4b70903526fe0c
scsi: ibmvscsi: Avoid multi-field memset() overflow by aiming at srp

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memset(), avoid intentionally writing across
neighboring fields.

Instead of writing beyond the end of evt_struct->iu.srp.cmd, target the
upper union (evt_struct->iu.srp) instead, as that's what is being wiped.

Cc: Tyrel Datwyler <tyreld@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/lkml/yq135rzp79c.fsf@ca-mkp.ca.oracle.com
Acked-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Link: https://lore.kernel.org/lkml/6eae8434-e9a7-aa74-628b-b515b3695359@linux.ibm.com
drivers/scsi/ibmvscsi/ibmvscsi.c