Author: ngie
Date: Fri May 13 09:07:42 2016
New Revision: 299636
URL: https://svnweb.freebsd.org/changeset/base/299636

Log:
  MFstable/10 r299635:
  
  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

Modified:
  stable/9/sys/dev/aacraid/aacraid_cam.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/aacraid/aacraid_cam.c
==============================================================================
--- stable/9/sys/dev/aacraid/aacraid_cam.c      Fri May 13 09:06:52 2016        
(r299635)
+++ stable/9/sys/dev/aacraid/aacraid_cam.c      Fri May 13 09:07:42 2016        
(r299636)
@@ -570,9 +570,11 @@ aac_container_special_command(struct cam
                                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) {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to