Author: pluknet
Date: Sun Aug 26 12:07:23 2012
New Revision: 239714
URL: http://svn.freebsd.org/changeset/base/239714

Log:
  MFC r239468:
   Avoid segfault in the 'smpphylist' subcommand.

Modified:
  stable/9/sbin/camcontrol/camcontrol.c
Directory Properties:
  stable/9/sbin/camcontrol/   (props changed)

Modified: stable/9/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/9/sbin/camcontrol/camcontrol.c       Sun Aug 26 10:40:13 2012        
(r239713)
+++ stable/9/sbin/camcontrol/camcontrol.c       Sun Aug 26 12:07:23 2012        
(r239714)
@@ -5458,6 +5458,7 @@ smpphylist(struct cam_device *device, in
 
        bzero(&(&ccb->ccb_h)[1],
              sizeof(union ccb) - sizeof(struct ccb_hdr));
+       STAILQ_INIT(&devlist.dev_queue);
 
        rgrequest = malloc(sizeof(*rgrequest));
        if (rgrequest == NULL) {
@@ -5526,7 +5527,6 @@ smpphylist(struct cam_device *device, in
                goto bailout;
        }
 
-       STAILQ_INIT(&devlist.dev_queue);
        devlist.path_id = device->path_id;
 
        retval = buildbusdevlist(&devlist);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"

Reply via email to