From owner-svn-src-stable-11@freebsd.org Mon Jul 3 08:53:24 2017 Return-Path: Delivered-To: svn-src-stable-11@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 4762B9E1634; Mon, 3 Jul 2017 08:53:24 +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 mx1.freebsd.org (Postfix) with ESMTPS id 14F5C3BD9; Mon, 3 Jul 2017 08:53:24 +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 v638rNvu098908; Mon, 3 Jul 2017 08:53:23 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v638rMGi098905; Mon, 3 Jul 2017 08:53:22 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201707030853.v638rMGi098905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 3 Jul 2017 08:53:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r320593 - in stable/11/sys/netpfil/ipfw: nat64 nptv6 pmod X-SVN-Group: stable-11 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: in stable/11/sys/netpfil/ipfw: nat64 nptv6 pmod X-SVN-Commit-Revision: 320593 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2017 08:53:24 -0000 Author: ae Date: Mon Jul 3 08:53:22 2017 New Revision: 320593 URL: https://svnweb.freebsd.org/changeset/base/320593 Log: MFC r320479: Fix IPv6 extension header parsing. The length field doesn't include the first 8 octets. Obtained from: Yandex LLC Modified: stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c stable/11/sys/netpfil/ipfw/nptv6/nptv6.c stable/11/sys/netpfil/ipfw/pmod/tcpmod.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c ============================================================================== --- stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c Mon Jul 3 08:32:52 2017 (r320592) +++ stable/11/sys/netpfil/ipfw/nat64/nat64_translate.c Mon Jul 3 08:53:22 2017 (r320593) @@ -1054,7 +1054,7 @@ nat64_getlasthdr(struct mbuf *m, int *offset) if (proto == IPPROTO_HOPOPTS && ip6->ip6_plen == 0) return (-1); proto = hbh->ip6h_nxt; - hlen += hbh->ip6h_len << 3; + hlen += (hbh->ip6h_len + 1) << 3; } if (offset != NULL) *offset = hlen; Modified: stable/11/sys/netpfil/ipfw/nptv6/nptv6.c ============================================================================== --- stable/11/sys/netpfil/ipfw/nptv6/nptv6.c Mon Jul 3 08:32:52 2017 (r320592) +++ stable/11/sys/netpfil/ipfw/nptv6/nptv6.c Mon Jul 3 08:53:22 2017 (r320593) @@ -125,7 +125,7 @@ nptv6_getlasthdr(struct nptv6_cfg *cfg, struct mbuf *m if (m->m_len < hlen) return (-1); proto = hbh->ip6h_nxt; - hlen += hbh->ip6h_len << 3; + hlen += (hbh->ip6h_len + 1) << 3; } if (offset != NULL) *offset = hlen; Modified: stable/11/sys/netpfil/ipfw/pmod/tcpmod.c ============================================================================== --- stable/11/sys/netpfil/ipfw/pmod/tcpmod.c Mon Jul 3 08:32:52 2017 (r320592) +++ stable/11/sys/netpfil/ipfw/pmod/tcpmod.c Mon Jul 3 08:53:22 2017 (r320593) @@ -137,7 +137,7 @@ tcpmod_ipv6_setmss(struct mbuf **mp, uint16_t mss) proto == IPPROTO_DSTOPTS) { hbh = mtodo(*mp, hlen); proto = hbh->ip6h_nxt; - hlen += hbh->ip6h_len << 3; + hlen += (hbh->ip6h_len + 1) << 3; } tcp = mtodo(*mp, hlen); plen = (*mp)->m_pkthdr.len - hlen;