From owner-svn-src-all@freebsd.org Wed Jun 26 17:21:31 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D62A715CD947; Wed, 26 Jun 2019 17:21:31 +0000 (UTC) (envelope-from ae@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) server-signature RSA-PSS (4096 bits) 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 7D02176CE4; Wed, 26 Jun 2019 17:21:31 +0000 (UTC) (envelope-from ae@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 55E192BA2; Wed, 26 Jun 2019 17:21:31 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5QHLVQc073695; Wed, 26 Jun 2019 17:21:31 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5QHLVBw073694; Wed, 26 Jun 2019 17:21:31 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201906261721.x5QHLVBw073694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 26 Jun 2019 17:21:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r349429 - releng/11.3/sys/netpfil/ipfw/nat64 X-SVN-Group: releng X-SVN-Commit-Author: ae X-SVN-Commit-Paths: releng/11.3/sys/netpfil/ipfw/nat64 X-SVN-Commit-Revision: 349429 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7D02176CE4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jun 2019 17:21:32 -0000 Author: ae Date: Wed Jun 26 17:21:30 2019 New Revision: 349429 URL: https://svnweb.freebsd.org/changeset/base/349429 Log: Merge from stable/11: Fix the uninitialized use of source IPv6 address in NAT64LSN. This code is already refactored in head/, but due to the missing epoch(9) support it is impossible to merge. So, it is direct commit to stable/11. Reported by: Patrick M. Hausen Tested by: Patrick M. Hausen Approved by: re (kib, gjb) Modified: releng/11.3/sys/netpfil/ipfw/nat64/nat64lsn.c Directory Properties: releng/11.3/ (props changed) Modified: releng/11.3/sys/netpfil/ipfw/nat64/nat64lsn.c ============================================================================== --- releng/11.3/sys/netpfil/ipfw/nat64/nat64lsn.c Wed Jun 26 17:17:33 2019 (r349428) +++ releng/11.3/sys/netpfil/ipfw/nat64/nat64lsn.c Wed Jun 26 17:21:30 2019 (r349429) @@ -408,6 +408,7 @@ nat64lsn_translate4(struct nat64lsn_cfg *cfg, const st } else logdata = NULL; + src6 = cfg->base.plat_prefix; nat64_embed_ip4(&src6, cfg->base.plat_plen, htonl(f_id->src_ip)); ret = nat64_do_handle_ip4(*pm, &src6, &nh->addr, lport, &cfg->base, logdata);