From owner-svn-src-stable@freebsd.org Thu Jul 30 01:52:42 2020 Return-Path: Delivered-To: svn-src-stable@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 A7C82372C18; Thu, 30 Jul 2020 01:52:42 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from CAN01-TO1-obe.outbound.protection.outlook.com (mail-to1can01on0620.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5d::620]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "GlobalSign Organization Validation CA - SHA256 - G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BHD1x63qNz4XJB; Thu, 30 Jul 2020 01:52:37 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n3xbzEDJL6nKNIaTZz6vnIR144WNtJZKcmswdVFF70nd6bvZsnSstRcwSfcbKdB3Drlm+eDXmebvXLAfDefMXVnJwuP+GnYMS8jwnBmex98IZoC8BE8eYmBupZP371xoUEAJi6j1646MkUETTnXJdl3cljuJcdEdQbPVHeZ1DyEpmg4qfiQS3zfU9dBS701dKtbqNUAyioKexwSk0J26sSK49iPsGbYShIk8AlzFaLq0rvbux3mpupLCkQDWFa14YkhjkoQnaUuF7U7Zd4MitlJzq+0EdRmvel04lJZyxCPQw5Yjd93T9IIWXFgkvzq+363W5aW5de2IsLRCcx0Axw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0X7tqfjSl26kPG2eZDYItDp+CifDQaVOdAWnm+GooZk=; b=UVKbP9qnc9G9GWFmtY5UZ2sAsneYFMtfs7sdlSH0hwcqFjj5eDHlvurk2OmoOHa7fIb7gHxR6TGUyv2zlQ8vECLWlRsh2TVMi60x4moA/zuC9trGIehPE7MS3e49EzZN4Fzri0buLUTc4Yug84c/B97o5+aamei+PbVNMXMXioTDsIcWhS0e5hqWdTKXosd4hxDesIpAWBvTh68a6NOtfZdZkcs5t42Gzf1meNo432cTlWhiJ4r+aNUxEmvJ8DhQSW2mplqjNoBTZjZbirjcbHZNX9mEq9ZNrmPoDcaHk6NT5ykeTht1EV5XrNlxvAi2HcQoMKp4hg2BpUnpOgudrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=uoguelph.ca; dmarc=pass action=none header.from=uoguelph.ca; dkim=pass header.d=uoguelph.ca; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uoguelph.ca; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0X7tqfjSl26kPG2eZDYItDp+CifDQaVOdAWnm+GooZk=; b=ucc7SHI+S44VLo7syNHe42MeVsBiXWz/FH4RYr051SA/nZvPfqVFVN9MoY/9j76Q43MPIyJUCmMDiYYTMuA+q9vvgrM69RlsgAmVRHu+pAsFTp3D6wxHXY1Fa9z2u2kNsBu3K1w2zCITRmSJdDFo4IzhpYYoEDuUPrsLkP4TRy29C3YbDMXfP6XUvVtyMGSWG5PxEp7RehRCtDUU9C1HskDFQexhzReBtvANVYDXFK0rEUA+PLZh7j57aE0vSi8z6zEzhNXh6mcfa6egHHKfJMIPREhHvK+W+h/6TJE2OR+NBNtIDOFqJDhty7goCo1wwvhjVXdZVbgNH+hIiL+eWQ== Received: from QB1PR01MB3364.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:38::14) by YQBPR0101MB1940.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.28; Thu, 30 Jul 2020 01:52:35 +0000 Received: from QB1PR01MB3364.CANPRD01.PROD.OUTLOOK.COM ([fe80::60f3:4ca2:8a4a:1e91]) by QB1PR01MB3364.CANPRD01.PROD.OUTLOOK.COM ([fe80::60f3:4ca2:8a4a:1e91%7]) with mapi id 15.20.3216.033; Thu, 30 Jul 2020 01:52:35 +0000 From: Rick Macklem To: Brooks Davis , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-stable@freebsd.org" , "svn-src-stable-12@freebsd.org" Subject: Re: svn commit: r363625 - stable/12/usr.sbin/mountd Thread-Topic: svn commit: r363625 - stable/12/usr.sbin/mountd Thread-Index: AQHWZGw7l3AA2GANGkmYHY+WWlMRT6kfVzKs Date: Thu, 30 Jul 2020 01:52:35 +0000 Message-ID: References: <202007272318.06RNIFjV005206@repo.freebsd.org> In-Reply-To: <202007272318.06RNIFjV005206@repo.freebsd.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 07933a14-c3df-49d3-1c6d-08d8342b3b3f x-ms-traffictypediagnostic: YQBPR0101MB1940: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: siACDIdhffcmbtaAL0qImLDdF4nhz0gHPkNnfIWUXlt4AKs1V9HP+JGZTe/dheWMLAcS2xAvsGJmg6vrItaNJh2tUtV0TWUtWvcfVQ701j2WbDjo4JaPn0saxDH0jApbw+CI8bph/qoDjbYKZiNWyFBPigaimQjc48qFs9BBy6W7GyE4XfcRJR4Ar2MFgc/rHFLmo8UPGRZ25/rn4XHmo9gu6s925UVdzz0vPOGyNxo0AET7xGCDVagrtQp2akkr4fA2uY+oUJjJ/XkNyvyPjdmQosnTiaw3JF93IXNxZdEKZU7SpECyA9s1Erk3MdJLVjOCNc3t8nFkL02daUC6ZqT7bw2e+2pKRIDthwxynTsijApazjE3q5a5d0AKmUn3cbb9jDeOSFv0ScqylsNR1w== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:QB1PR01MB3364.CANPRD01.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFTY:; SFS:(396003)(346002)(39860400002)(136003)(376002)(366004)(478600001)(966005)(2906002)(9686003)(786003)(316002)(55016002)(110136005)(71200400001)(5660300002)(8936002)(52536014)(66446008)(186003)(450100002)(76116006)(91956017)(66476007)(33656002)(83380400001)(7696005)(66946007)(6506007)(86362001)(64756008)(66556008)(8676002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: GSb1TaJP9Rqsb5L1NO7EjMCyq0A0RwGgQKi+KikXb45lP1ugsqejaafABvhvpXlI9+a5xdiDiO+HgrysAiCWLLQ2cGtCFd/zDCPDJmwnGDXJCSXu5XYSq1wzpteNdmZySUFzNx6crKWCBK9gGgwhPP2+ltkoQ+EwveoOO+BOOEqHIEwIYFYrLz5GWP7kt/vQTf0jssvM5/hCPDpLxMzW/Wa+yGiqjwzT0AW1Aya47aOkIhlrNL2jX2e4FFwvvS4GqJ92XBOlbIECWJAqAdWnZpDLFCRQ+fNJwCRTxbjekMSn50GebqKBOMXkcYtRH7s8FeMjA+6hOXcyQnPGtfDx2Y5Aq8ZEWG6l94vQN6+aCwOSnvH4HTQ+vkf7tYr2mfiaVUZZ4alF++eEF2c83lwcW8jWivgSQoCTY8Jwnz//IFZOKMLnNgeJnexO+kbSigwEMT+9y5xX5ozfic/EOroXxq/tCPBJAqgoxcC0PxTRyaTnHwJY+P+0I+n2kONh3+n8+eS+hGW41sgjpNh0HUgEs1mXZmgg1U53GB0pQWIaUBLZYEv3vPhqTtULaHPJRN6G x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: uoguelph.ca X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: QB1PR01MB3364.CANPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 07933a14-c3df-49d3-1c6d-08d8342b3b3f X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2020 01:52:35.4295 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: be62a12b-2cad-49a1-a5fa-85f4f3156a7d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Nrsw0j8vPjlixyDmDCeI2gFXjP23WMHOs+eyRoPp3OTdYWCIQ08YR2TGiso0ejArawQqZSMGlypuvNlRr0jD7A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: YQBPR0101MB1940 X-Rspamd-Queue-Id: 4BHD1x63qNz4XJB X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=uoguelph.ca header.s=selector1 header.b=ucc7SHI+; dmarc=none; spf=pass (mx1.freebsd.org: domain of rmacklem@uoguelph.ca designates 2a01:111:f400:fe5d::620 as permitted sender) smtp.mailfrom=rmacklem@uoguelph.ca X-Spamd-Result: default: False [-5.17 / 15.00]; TO_DN_EQ_ADDR_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-0.98)[-0.981]; R_DKIM_ALLOW(-0.20)[uoguelph.ca:s=selector1]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:111:f400::/48]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[uoguelph.ca]; NEURAL_HAM_LONG(-1.03)[-1.027]; RCPT_COUNT_FIVE(0.00)[5]; DWL_DNSWL_LOW(-1.00)[uoguelph.ca:dkim]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[uoguelph.ca:+]; NEURAL_HAM_SHORT(-0.67)[-0.666]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:8075, ipnet:2a01:111:f000::/36, country:US]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1] X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 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: Thu, 30 Jul 2020 01:52:42 -0000 Brooks Davis wrote:=0A= >Author: brooks=0A= >Date: Mon Jul 27 23:18:14 2020=0A= >New Revision: 363625=0A= >URL: https://svnweb.freebsd.org/changeset/base/363625=0A= >=0A= >Log:=0A= > MFC r363439:=0A= >=0A= > Correct a type-mismatch between xdr_long and the variable "bad".=0A= >=0A= > Way back in r28911 (August 1997, CVS rev 1.22) we imported a NetBSD=0A= > information leak fix via OpenBSD. Unfortunatly we failed to track the= =0A= > followup commit that fixed the type of the error code. Apply the change= =0A= > from int to long now.=0A= I don't think this is correct.=0A= RFC-1813 defines the error return for a MNT RPC as a 32bit quantity.=0A= =0A= Way back when this stuff was written it was in K&R days and "long" was=0A= always a 32bit integer.=0A= =0A= If you look at head/lib/libc/xdr/xdr.c you'll see "long" used to refer to 3= 2bit=0A= numbers throughout it. Look near the end, where it does a "longlong" (64bit= s)=0A= using 2 longs.=0A= =0A= The good news w.r.t. this ancient code is that XDR_PUTLONG() assumes 32bits= .=0A= =0A= Also, note that xdr_int() and xdr_long() do exactly the same thing.=0A= =0A= I support int32_t would be preferred to "int" to make sure "bad" is 32bits= =0A= and then you can use xdr_int32_t(), which does exactly the same thing as=0A= xdr_int() and about the same thing as xdr_long(). { They all assume a "long= "=0A= is 32bits. Scary to look at now that "long" isn't always 32bits. }=0A= --> I can't see how the xdr.c code would work for a machine that is BIG_END= IAN=0A= and where "long" is 64bits, but we don't have any of those.=0A= =0A= I don't think "int bad" was wrong and "long bad" definitely seems wrong for= =0A= 64bit systems, although the xdr.c code simply ends up putting the low order= =0A= 32bits on the wire, I think?=0A= =0A= rick=0A= =0A= Reviewed by: emaste=0A= Reported by: CHERI=0A= Obtained from: CheriBSD=0A= Sponsored by: DARPA=0A= Differential Revision: https://reviews.freebsd.org/D25779=0A= =0A= Modified:=0A= stable/12/usr.sbin/mountd/mountd.c=0A= Directory Properties:=0A= stable/12/ (props changed)=0A= =0A= Modified: stable/12/usr.sbin/mountd/mountd.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=0A= --- stable/12/usr.sbin/mountd/mountd.c Mon Jul 27 21:19:41 2020 (r3= 63624)=0A= +++ stable/12/usr.sbin/mountd/mountd.c Mon Jul 27 23:18:14 2020 (r3= 63625)=0A= @@ -1087,7 +1087,8 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *transp)=0A= struct sockaddr *saddr;=0A= u_short sport;=0A= char rpcpath[MNTPATHLEN + 1], dirpath[MAXPATHLEN];=0A= - int bad =3D 0, defset, hostset;=0A= + int defset, hostset;=0A= + long bad =3D 0;=0A= sigset_t sighup_mask;=0A= int numsecflavors, *secflavorsp;=0A= =0A=