From owner-svn-src-stable@FreeBSD.ORG Wed Oct 9 19:03:00 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B102D980; Wed, 9 Oct 2013 19:03:00 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 847322DBD; Wed, 9 Oct 2013 19:03:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99J303q064030; Wed, 9 Oct 2013 19:03:00 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99J2xc7064008; Wed, 9 Oct 2013 19:02:59 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201310091902.r99J2xc7064008@svn.freebsd.org> From: Alexander Motin Date: Wed, 9 Oct 2013 19:02:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r256217 - in stable/9/sys: cam/ctl net netpfil/ipfw X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Oct 2013 19:03:00 -0000 Author: mav Date: Wed Oct 9 19:02:59 2013 New Revision: 256217 URL: http://svnweb.freebsd.org/changeset/base/256217 Log: MFC r250131 (by eadler): Correct a few sizeof()s Modified: stable/9/sys/cam/ctl/ctl_frontend_internal.c stable/9/sys/net/if_spppsubr.c stable/9/sys/netpfil/ipfw/ip_dummynet.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/net/ (props changed) Modified: stable/9/sys/cam/ctl/ctl_frontend_internal.c ============================================================================== --- stable/9/sys/cam/ctl/ctl_frontend_internal.c Wed Oct 9 18:58:28 2013 (r256216) +++ stable/9/sys/cam/ctl/ctl_frontend_internal.c Wed Oct 9 19:02:59 2013 (r256217) @@ -253,7 +253,7 @@ cfi_init(void) sizeof(struct cfi_lun_io), CTL_PORT_PRIV_SIZE); } - memset(softc, 0, sizeof(softc)); + memset(softc, 0, sizeof(*softc)); mtx_init(&softc->lock, "CTL frontend mutex", NULL, MTX_DEF); softc->flags |= CTL_FLAG_MASTER_SHELF; Modified: stable/9/sys/net/if_spppsubr.c ============================================================================== --- stable/9/sys/net/if_spppsubr.c Wed Oct 9 18:58:28 2013 (r256216) +++ stable/9/sys/net/if_spppsubr.c Wed Oct 9 19:02:59 2013 (r256217) @@ -3619,7 +3619,7 @@ sppp_ipv6cp_RCR(struct sppp *sp, struct continue; } - bzero(&suggestaddr, sizeof(&suggestaddr)); + bzero(&suggestaddr, sizeof(suggestaddr)); if (collision && nohisaddr) { /* collision, hisaddr unknown - Conf-Rej */ type = CONF_REJ; Modified: stable/9/sys/netpfil/ipfw/ip_dummynet.c ============================================================================== --- stable/9/sys/netpfil/ipfw/ip_dummynet.c Wed Oct 9 18:58:28 2013 (r256216) +++ stable/9/sys/netpfil/ipfw/ip_dummynet.c Wed Oct 9 19:02:59 2013 (r256217) @@ -617,7 +617,7 @@ fsk_detach(struct dn_fsk *fs, int flags) fs->sched->fp->free_fsk(fs); fs->sched = NULL; if (flags & DN_DELETE_FS) { - bzero(fs, sizeof(fs)); /* safety */ + bzero(fs, sizeof(*fs)); /* safety */ free(fs, M_DUMMYNET); dn_cfg.fsk_count--; } else {