From owner-svn-src-head@freebsd.org Sat Dec 10 23:49:15 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77635C7144B for ; Sat, 10 Dec 2016 23:49:15 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wj0-x22d.google.com (mail-wj0-x22d.google.com [IPv6:2a00:1450:400c:c01::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0FF4B12BA for ; Sat, 10 Dec 2016 23:49:15 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wj0-x22d.google.com with SMTP id v7so43242090wjy.2 for ; Sat, 10 Dec 2016 15:49:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=UIRWT7Qlb4L1V4BBbiU9h6axJ2uJtTB3G1T0kWq2AF0=; b=zlfhbgCUu5F851/L+ZvxdKSAD+y3VXCbMJkQLfWINiIP3Oz8Nz3hQCiu4piml8ewum watzc709PmVOntZFv3TEdD42LDSNj8wlduvDwMkeumaVH6IUADLdN8IsU0/3SnyKYwRB FPNC4d//aGbXCNuY0kPj7MvOwer9N4lRiKUwIHh27gRWnFuWUtpO0DHoqPje6X0P2/8d /3c3jKqCWFVvX8M+BB4i8L3NJOWW6aSGq+OveucgEm7MXQ4UQ4yK8iHa2bvT+cjucc5/ TaQOeaHXZh13llaSgI9VcWpZqzPbyJcnVZo1uqkZa6Xc++TyJx63lsSaRGYicSkn7gAk qHuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=UIRWT7Qlb4L1V4BBbiU9h6axJ2uJtTB3G1T0kWq2AF0=; b=mf0QMufkuyNQDm6A6HGquzb5madqTuaNlsCGWE5xaieF2FpYCUbC9COVwO/Y+PVkbz CaPMr5R/5woJKHjAKeG75+9cTj/OUWXnU7zw6pnyPQ9vAEYEuZzUuO9yaVdDN97ZIk8F SC7U4s90B97u31o/K4uPdkvlOBg653o2p1ueNpkyNlPgtgOjdOkL6UKYWpRP1TWNVN1q uCmOnNmnMYnzWMFl+yICAYZB7/Wcb6XaTE67NIjiaGsOqOskxQ14wDfR0VxMHwrt5vpv rxu+teoEDGy1JSTkJNX5M4TZm/KmLoR8YCuW0g7CaohW15OLm7d3E/dk1ujJetHGxVLe 8wBw== X-Gm-Message-State: AKaTC03yv+VpWaN58DUk7/lSEnwZrUm0m5Ck1d+KA2aaX1By5/HNC0yik/NlBP9zBzfkcLYw/UiEHOXR/asNooVG X-Received: by 10.194.0.43 with SMTP id 11mr74353932wjb.218.1481413753483; Sat, 10 Dec 2016 15:49:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.194.253.65 with HTTP; Sat, 10 Dec 2016 15:49:12 -0800 (PST) In-Reply-To: <201610201942.u9KJgQOR062772@repo.freebsd.org> References: <201610201942.u9KJgQOR062772@repo.freebsd.org> From: Oliver Pinter Date: Sun, 11 Dec 2016 00:49:12 +0100 Message-ID: Subject: Re: svn commit: r307684 - head/sbin/camcontrol To: "Kenneth D. Merry" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Dec 2016 23:49:15 -0000 On 10/20/16, Kenneth D. Merry wrote: > Author: ken > Date: Thu Oct 20 19:42:26 2016 > New Revision: 307684 > URL: https://svnweb.freebsd.org/changeset/base/307684 > > Log: > For CCBs allocated on the stack, we need to clear the entire CCB, not > just > the header. Otherwise stack garbage can lead to random flags getting > set. > > This showed up as 'camcontrol rescan all' failing with EINVAL because the > address type wasn't CAM_DATA_VADDR. > > sbin/camcontrol/camcontrol.c: > In rescan_or_reset_bus(), bzero the stack-allocated CCBs before > use instead of clearing the body. > > MFC after: 3 days > Sponsored by: Spectra Logic The MFC of this commit is missed both for 10-STABLE and 11-STABLE. Is this still in plan to do? > > Modified: > head/sbin/camcontrol/camcontrol.c > > Modified: head/sbin/camcontrol/camcontrol.c > ============================================================================== > --- head/sbin/camcontrol/camcontrol.c Thu Oct 20 18:43:12 2016 (r307683) > +++ head/sbin/camcontrol/camcontrol.c Thu Oct 20 19:42:26 2016 (r307684) > @@ -3139,6 +3139,8 @@ rescan_or_reset_bus(path_id_t bus, int r > return(1); > } > > + bzero(&ccb, sizeof(ccb)); > + > if (bus != CAM_BUS_WILDCARD) { > ccb.ccb_h.func_code = rescan ? XPT_SCAN_BUS : XPT_RESET_BUS; > ccb.ccb_h.path_id = bus; > @@ -3181,7 +3183,7 @@ rescan_or_reset_bus(path_id_t bus, int r > * no-op, sending a rescan to the xpt bus would result in a status of > * CAM_REQ_INVALID. > */ > - CCB_CLEAR_ALL_EXCEPT_HDR(&matchccb.cdm); > + bzero(&matchccb, sizeof(matchccb)); > matchccb.ccb_h.func_code = XPT_DEV_MATCH; > matchccb.ccb_h.path_id = CAM_BUS_WILDCARD; > bufsize = sizeof(struct dev_match_result) * 20; > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >