Date: Fri, 31 Aug 2018 00:12:40 +0200 From: "Kristof Provost" <kp@FreeBSD.org> To: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> Cc: "Jonathan T. Looney" <jtl@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r337776 - head/sys/netinet6 Message-ID: <11A2CD98-032D-4181-9CC9-D8A14ACAFCDE@FreeBSD.org> In-Reply-To: <0793AABF-F027-407B-8ACD-1CA4B67260EE@lists.zabbadoz.net> References: <201808141717.w7EHHcPf010971@repo.freebsd.org> <7C9F31C2-839C-4537-A43D-F51A54380BDA@FreeBSD.org> <0793AABF-F027-407B-8ACD-1CA4B67260EE@lists.zabbadoz.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 31 Aug 2018, at 0:07, Bjoern A. Zeeb wrote: > On 30 Aug 2018, at 22:00, Kristof Provost wrote: >> I’ve done this, which fixes the problem: >> >> diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c >> index 0f30801540a..e1f2b3f5842 100644 >> --- a/sys/netinet6/frag6.c >> +++ b/sys/netinet6/frag6.c >> @@ -218,7 +218,9 @@ frag6_input(struct mbuf **mp, int *offp, int >> proto) >> int offset = *offp, nxt, i, next; >> int first_frag = 0; >> int fragoff, frgpartlen; /* must be larger than >> u_int16_t */ >> - uint32_t hash, hashkey[sizeof(struct in6_addr) * 2 + 1], >> *hashkeyp; >> + uint32_t hashkey[(sizeof(struct in6_addr) * 2 + >> sizeof(u_int32_t)) / > > Can we actually make it the size of the field rather than uint32_t > (not u_int32_t)? I guess not easily but at least change the type > spelling and leave a comment what it is? > I think we can spell that `sizeof(ip6f->ip6f_ident))`, yes. Kristof From owner-svn-src-head@freebsd.org Thu Aug 30 22:51:54 2018 Return-Path: <owner-svn-src-head@freebsd.org> Delivered-To: svn-src-head@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 762C1EFB403; Thu, 30 Aug 2018 22:51:54 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-TO1-obe.outbound.protection.outlook.com (mail-eopbgr670073.outbound.protection.outlook.com [40.107.67.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "Microsoft IT TLS CA 4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D0EA76248; Thu, 30 Aug 2018 22:51:54 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from YTOPR0101MB1820.CANPRD01.PROD.OUTLOOK.COM (52.132.44.160) by YTOPR0101MB1163.CANPRD01.PROD.OUTLOOK.COM (52.132.50.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.16; Thu, 30 Aug 2018 22:51:52 +0000 Received: from YTOPR0101MB1820.CANPRD01.PROD.OUTLOOK.COM ([fe80::7d32:736f:ee9e:e78c]) by YTOPR0101MB1820.CANPRD01.PROD.OUTLOOK.COM ([fe80::7d32:736f:ee9e:e78c%4]) with mapi id 15.20.1101.016; Thu, 30 Aug 2018 22:51:52 +0000 From: Rick Macklem <rmacklem@uoguelph.ca> To: Kristof Provost <kp@FreeBSD.org>, "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net> CC: "Jonathan T. Looney" <jtl@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r337776 - head/sys/netinet6 Thread-Topic: svn commit: r337776 - head/sys/netinet6 Thread-Index: AQHUQKzk5rC3xzr8VUWOGIAav8TBVqTY2lQAgAABdACAAAl6TA== Date: Thu, 30 Aug 2018 22:51:52 +0000 Message-ID: <YTOPR0101MB18205CC87F2317153940D6A7DD080@YTOPR0101MB1820.CANPRD01.PROD.OUTLOOK.COM> References: <201808141717.w7EHHcPf010971@repo.freebsd.org> <7C9F31C2-839C-4537-A43D-F51A54380BDA@FreeBSD.org> <0793AABF-F027-407B-8ACD-1CA4B67260EE@lists.zabbadoz.net>, <11A2CD98-032D-4181-9CC9-D8A14ACAFCDE@FreeBSD.org> In-Reply-To: <11A2CD98-032D-4181-9CC9-D8A14ACAFCDE@FreeBSD.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=rmacklem@uoguelph.ca; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; YTOPR0101MB1163; 6:UhAyQpH5knvaNUoQ5G+JGHW1ZFodpSqwyrf+17aWpzBD+umegvJ3IkKtHoDvfooclokpiE4YGQrB86UYWM7Pi1H3+RuzZijX+hqc3aMmcKUTrxc3HEynGI7sGZFJz0uKBuBx6rXeBQxBR6ymwbViuN1DAiQdC03Y+16nZuL3LZJyIjThls5Rd/ybwYMzzpiWu52YdO82zq12dRB6jkd+fW5df/fJAq2m21bkUMzhateDvYPVmrG3w/sg8YKCji5/Xf7JMfMbjX0VeMaGWEJ+JKY3xXpVb1Oz4zMYTgkhamqDjibJkoLq42Q1LY5F2aed+fRdRSiN84+4qJ6UqsVHdzqfV4hXYyQ2mN/W/vpLKYxipQBv+MnDCX0fgAY3M/TDNkI6tOMrqQ4iBWA37cqlV/M5dq4XQ6NX9T7Wv4VuFcA2RrYlH60gpONTMSeRlMd1SOUSRyCTxCjU2F2+NZ/qXg==; 5:A/I9NvpfDtRFOTei7vpxAyMRJbnzzNItqEabjG3v2VMKPNC9o/1bSNRtBOSBTXGx+iCWuuYrEky4MBla2+ySgR7ZlbFJm6KTXPkTJiDpNjJYvJhGKg77IFEC0u+1Bqf13YEN7Aabgh7VzzGADwh/VTh0mzmWl6f/AIH1BTgV3ng=; 7:BMQMVCId4Iaxvbk/IIL1s7fPkB7qvztkl8N51ybjOVNFtmfxEbDnmJ25ZQ8cIR37g2JBev7emWxqStuK8AZyJ+8won+P3CL2w8ouZDq0DCVxKgxMbL02AYr90IYZRVOtEQwPOfsANmX599iwLRxaERd4d0hjwvZw2qNYcbP3TrvcgZuFgDk/SJUZwWp8iQDrZ7iDEF06CsGtrSEBP2XHA/gPu5WTyt7k+fHp5/JUQR9/qm1NAb6bAE3IZuDRdknS x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 28d4ec76-0b79-4419-f8d2-08d60ecb2dba x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:YTOPR0101MB1163; x-ms-traffictypediagnostic: YTOPR0101MB1163: x-microsoft-antispam-prvs: <YTOPR0101MB1163B27651A2439756E45172DD080@YTOPR0101MB1163.CANPRD01.PROD.OUTLOOK.COM> x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231311)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(201703131423095)(201702281529075)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699016); SRVR:YTOPR0101MB1163; BCL:0; PCL:0; RULEID:; SRVR:YTOPR0101MB1163; x-forefront-prvs: 07807C55DC x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(39850400004)(396003)(136003)(346002)(376002)(199004)(189003)(2900100001)(97736004)(4326008)(74482002)(229853002)(316002)(14454004)(25786009)(786003)(106356001)(53936002)(105586002)(86362001)(55016002)(54906003)(486006)(6436002)(966005)(110136005)(33656002)(478600001)(256004)(476003)(446003)(53546011)(6506007)(102836004)(5250100002)(6246003)(8676002)(9686003)(76176011)(5660300001)(8936002)(7696005)(186003)(81156014)(26005)(6306002)(305945005)(68736007)(81166006)(11346002)(2906002)(99286004)(74316002)(93886005); DIR:OUT; SFP:1101; SCL:1; SRVR:YTOPR0101MB1163; H:YTOPR0101MB1820.CANPRD01.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: uoguelph.ca does not designate permitted sender hosts) x-microsoft-antispam-message-info: FTIHNobUr8mkmGZxZxvgPN5Z/Q5Naqg3uYPAmeQ857GlE9YTELqiwf1mRo4peoGUdZO0bRwhv4bbI3Elq+WQQrS/cr9SyBL+2YM/FDdSTs1bvIOQJZJjKbTfrUEOsAgrT/j0DIzNkY198BxMqU7Xfl8qpDXCVWKauR3eCdaZBhMt0yCC4z2Jc2jtaZFWc/b7x4E/yG5nTS3ztshsDvGkZUjpMgM/+esWTo1uYdzG5KtAHjFmBMsa+51/ECGH9/UmvF2IpaVRG4AoVTYOZ/ZI11O9L3Y9wQSg4ewLADCAAQfmFUN6ygvfxunivbWThmO6Ix7UbhDYTEE+tiAgaadflCNfom7TBcPFyvndyFga6UA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-Network-Message-Id: 28d4ec76-0b79-4419-f8d2-08d60ecb2dba X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Aug 2018 22:51:52.7256 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-Transport-CrossTenantHeadersStamped: YTOPR0101MB1163 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current <svn-src-head.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>; List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 30 Aug 2018 22:51:54 -0000 Sorry for the top post, but I'm on a web based email. pi@freebsd.org reported a problem w.r.t. IPv6 fragmentation when using NFS. (He switched from UDP --> TCP and the problem went away.) It's over here on freebsd-stable: http://docs.FreeBSD.org/cgi/mid.cgi?20180827155651.GW2118 I don't know if this is related, given that it is a recent commit. (There have been a bunch of other IPv6 fragmentation commits.) rick ________________________________________ From: owner-src-committers@freebsd.org <owner-src-committers@freebsd.org> o= n behalf of Kristof Provost <kp@FreeBSD.org> Sent: Thursday, August 30, 2018 6:12:40 PM To: Bjoern A. Zeeb Cc: Jonathan T. Looney; src-committers@freebsd.org; svn-src-all@freebsd.org= ; svn-src-head@freebsd.org Subject: Re: svn commit: r337776 - head/sys/netinet6 On 31 Aug 2018, at 0:07, Bjoern A. Zeeb wrote: On 30 Aug 2018, at 22:00, Kristof Provost wrote: I=92ve done this, which fixes the problem: diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 0f30801540a..e1f2b3f5842 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -218,7 +218,9 @@ frag6_input(struct mbuf **mp, int *offp, int proto) int offset =3D *offp, nxt, i, next; int first_frag =3D 0; int fragoff, frgpartlen; /* must be larger than u_int16_t */ - uint32_t hash, hashkey[sizeof(struct in6_addr) * 2 + 1], *hashkeyp; + uint32_t hashkey[(sizeof(struct in6_addr) * 2 + sizeof(u_int32_t)) / Can we actually make it the size of the field rather than uint32_t (not u_i= nt32_t)? I guess not easily but at least change the type spelling and leave= a comment what it is? I think we can spell that sizeof(ip6f->ip6f_ident)), yes. Kristof
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?11A2CD98-032D-4181-9CC9-D8A14ACAFCDE>