From 9e31d2f21193afef2836ffd5cc0ffe9027724f7f Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 13 May 2016 09:06:52 +0000 Subject: [PATCH] MFC r298665: r298665 (by cem): aacraid(4): Fix some mostly trivial buffer overruns strcpy(3) emits a trailing nul byte, trampling fields after the intended destination. Instead, use strncpy(3), intentionally leaving these fields not nul-terminated. CIDs: 1031024, 1305463, 1305494, 1305545 git-svn-id: svn://svn.freebsd.org/base/stable/10@299635 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/aacraid/aacraid_cam.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/aacraid/aacraid_cam.c b/sys/dev/aacraid/aacraid_cam.c index 56eaac00f..e09ffc3c8 100644 --- a/sys/dev/aacraid/aacraid_cam.c +++ b/sys/dev/aacraid/aacraid_cam.c @@ -570,9 +570,11 @@ aac_container_special_command(struct cam_sim *sim, union ccb *ccb, p->additional_length = 31; p->flags = SID_WBus16|SID_Sync|SID_CmdQue; /* OEM Vendor defines */ - strcpy(p->vendor,"Adaptec "); - strcpy(p->product,"Array "); - strcpy(p->revision,"V1.0"); + strncpy(p->vendor, "Adaptec ", sizeof(p->vendor)); + strncpy(p->product, "Array ", + sizeof(p->product)); + strncpy(p->revision, "V1.0", + sizeof(p->revision)); } } else { if (inq->page_code == SVPD_SUPPORTED_PAGE_LIST) { -- 2.45.0