From owner-svn-src-releng@freebsd.org Tue Dec 1 19:36:38 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 57A3F4B1FFD; Tue, 1 Dec 2020 19:36:38 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ClsmQ222Lz4lmd; Tue, 1 Dec 2020 19:36:38 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3867C1AED9; Tue, 1 Dec 2020 19:36:38 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B1Jackv004104; Tue, 1 Dec 2020 19:36:38 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B1Jabvs004087; Tue, 1 Dec 2020 19:36:37 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202012011936.0B1Jabvs004087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 1 Dec 2020 19:36:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r368252 - releng/12.2/sbin/ipfw X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: releng/12.2/sbin/ipfw X-SVN-Commit-Revision: 368252 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2020 19:36:38 -0000 Author: gordon Date: Tue Dec 1 19:36:36 2020 New Revision: 368252 URL: https://svnweb.freebsd.org/changeset/base/368252 Log: Fix uninitialized variable in ipfw. Approved by: so Security: FreeBSD-EN-20:21.ipfw Modified: releng/12.2/sbin/ipfw/dummynet.c releng/12.2/sbin/ipfw/ipfw2.c releng/12.2/sbin/ipfw/nat64lsn.c releng/12.2/sbin/ipfw/tables.c Modified: releng/12.2/sbin/ipfw/dummynet.c ============================================================================== --- releng/12.2/sbin/ipfw/dummynet.c Tue Dec 1 19:35:48 2020 (r368251) +++ releng/12.2/sbin/ipfw/dummynet.c Tue Dec 1 19:36:36 2020 (r368252) @@ -1279,8 +1279,8 @@ ipfw_config_pipe(int ac, char **av) struct dn_profile *pf = NULL; struct ipfw_flow_id *mask = NULL; #ifdef NEW_AQM - struct dn_extra_parms *aqm_extra; - struct dn_extra_parms *sch_extra; + struct dn_extra_parms *aqm_extra = NULL; + struct dn_extra_parms *sch_extra = NULL; int lmax_extra; #endif Modified: releng/12.2/sbin/ipfw/ipfw2.c ============================================================================== --- releng/12.2/sbin/ipfw/ipfw2.c Tue Dec 1 19:35:48 2020 (r368251) +++ releng/12.2/sbin/ipfw/ipfw2.c Tue Dec 1 19:36:36 2020 (r368252) @@ -1618,6 +1618,9 @@ print_instruction(struct buf_pr *bp, const struct form case O_TCPWIN: s = "tcpwin"; break; + default: + s = ""; + break; } bprintf(bp, " %s %u", s, cmd->arg1); } else @@ -4003,7 +4006,7 @@ chkarg: struct addrinfo *res; char *s, *end; int family; - u_short port_number; + u_short port_number = 0; NEED1("missing forward address[:port]"); @@ -5600,7 +5603,7 @@ ifinfo_cmp(const void *a, const void *b) static void ipfw_list_tifaces(void) { - ipfw_obj_lheader *olh; + ipfw_obj_lheader *olh = NULL; ipfw_iface_info *info; uint32_t i; int error; @@ -5608,7 +5611,6 @@ ipfw_list_tifaces(void) if ((error = ipfw_get_tracked_ifaces(&olh)) != 0) err(EX_OSERR, "Unable to request ipfw tracked interface list"); - qsort(olh + 1, olh->count, olh->objsize, ifinfo_cmp); info = (ipfw_iface_info *)(olh + 1); @@ -5625,7 +5627,3 @@ ipfw_list_tifaces(void) free(olh); } - - - - Modified: releng/12.2/sbin/ipfw/nat64lsn.c ============================================================================== --- releng/12.2/sbin/ipfw/nat64lsn.c Tue Dec 1 19:35:48 2020 (r368251) +++ releng/12.2/sbin/ipfw/nat64lsn.c Tue Dec 1 19:36:36 2020 (r368252) @@ -99,6 +99,7 @@ nat64lsn_print_states(void *buf) stg = (ipfw_nat64lsn_stg_v1 *)(od + 1); sz = od->head.length - sizeof(*od); next_idx = 0; + proto = NULL; while (sz > 0 && next_idx != 0xFF) { next_idx = stg->next.index; sz -= sizeof(*stg); Modified: releng/12.2/sbin/ipfw/tables.c ============================================================================== --- releng/12.2/sbin/ipfw/tables.c Tue Dec 1 19:35:48 2020 (r368251) +++ releng/12.2/sbin/ipfw/tables.c Tue Dec 1 19:36:36 2020 (r368252) @@ -847,7 +847,7 @@ table_show_info(ipfw_xtable_info *i, void *arg) static int table_show_one(ipfw_xtable_info *i, void *arg) { - ipfw_obj_header *oh; + ipfw_obj_header *oh = NULL; int error; int is_all; @@ -1179,7 +1179,7 @@ tentry_fill_key_type(char *arg, ipfw_obj_tentry *tentr struct servent *sent; int masklen; - masklen = 0; + mask = masklen = 0; af = 0; paddr = (struct in6_addr *)&tentry->k;