Date: Sun, 26 Aug 2012 12:07:23 +0000 (UTC) From: Sergey Kandaurov <pluknet@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r239714 - stable/9/sbin/camcontrol Message-ID: <201208261207.q7QC7NtI019560@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208261207.q7QC7NtI019560>