From nobody Mon Dec 06 14:18:42 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 11AE3189702E; Mon, 6 Dec 2021 14:18:43 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J75Bp41Ybz3pF7; Mon, 6 Dec 2021 14:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B5875342; Mon, 6 Dec 2021 14:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B6EIgQb095648; Mon, 6 Dec 2021 14:18:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6EIgS9095647; Mon, 6 Dec 2021 14:18:42 GMT (envelope-from git) Date: Mon, 6 Dec 2021 14:18:42 GMT Message-Id: <202112061418.1B6EIgS9095647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3f22f161b936 - stable/12 - dummynet: Fix socket option length validation for IP_DUMMYNET3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3f22f161b936b6279a68d6e9439b30f2abb50cad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638800322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y8WMACTI3iKYi1rvhpfSwCNxtpp/dbDyp1MuUV7I2LA=; b=NYyoxbfnMH3h01zTptuCnqlqoWeQK97VAnWAfD/avci8mznDazVxHu2wArwN1HXfoelGv3 yx3AFc9gbSEfdqp/zi1U8U8GBGDKTP9ozlIRjPJ1lsJsBYfWWZ1CCwodJjo9xiYv17BWw6 Totv3ns1bPHlHfzezhLcnkK9eb0tROmQ9rai5S9NvjDV4aSiTj6E2ahcPYaquAU8gyriRC 7SLsGsNx0hMn8M7ddOL8amLbrN7ST6AaS4neWYu7QitZHfy+tnrxlgdrQS7U0W7KHkDKWP Bcc73wotco25UKVGDjllpa08AkmgkwPwt5H8VVnw+ZcHYO9l+iF33jDgqL8UsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638800322; a=rsa-sha256; cv=none; b=SuPo5aNsFLPAH+3rdtktygQrkGDDyYevcCiDtH3u83MsCGa4bumO/O7fi3FGt8eiv3QigD xCiFx+HIUJf3RKogxCm0n5SF+cMnR8hkphEDqMn27eA+8PimSaElnZs9J4+RtZSoRjeMkM yv97naT0yQGOiGu8BF+8pnFStUErlhw6VMmxK4xuq3ehH+AvrjarZtYBOeuhQTzIaUIEYV +V1kRUyA4rnAbrpsRiA66nDB00uPhc6kjgkPejSiJKrkNBf7pGaAlD2IkQ+v+7sPx9phKr 2tRIakHBEWJpfnHuFgDLvjr4kU19P2VnYx0CCRk79P8/ZylO77rhTJMG68FNgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3f22f161b936b6279a68d6e9439b30f2abb50cad commit 3f22f161b936b6279a68d6e9439b30f2abb50cad Author: Mark Johnston AuthorDate: 2021-11-29 18:50:30 +0000 Commit: Mark Johnston CommitDate: 2021-12-06 14:18:24 +0000 dummynet: Fix socket option length validation for IP_DUMMYNET3 The socket option handler tries to ensure that the option length is no larger than some reasonable maximum, and no smaller than sizeof(struct dn_id). But the loaded option length is stored in an int, which is converted to an unsigned integer for the comparison with a size_t, so negative values are not caught and instead get passed to malloc(). Change the code to use a size_t for the buffer size. Reviewed by: kp Sponsored by: The FreeBSD Foundation (cherry picked from commit 1c732c85911eb9e39071cbdb50dfb1f0d76de40f) --- sys/netpfil/ipfw/ip_dn_private.h | 2 +- sys/netpfil/ipfw/ip_dummynet.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h index d33e0823f204..6a140e6b8a89 100644 --- a/sys/netpfil/ipfw/ip_dn_private.h +++ b/sys/netpfil/ipfw/ip_dn_private.h @@ -423,7 +423,7 @@ int dn_compat_copy_queue(struct copy_args *a, void *_o); int dn_compat_copy_pipe(struct copy_args *a, void *_o); int copy_data_helper_compat(void *_o, void *_arg); int dn_compat_calc_size(void); -int do_config(void *p, int l); +int do_config(void *p, size_t l); /* function to drain idle object */ void dn_drain_scheduler(void); diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index 57dbcb3c9a35..a637d4bbd317 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -1992,7 +1992,7 @@ dummynet_flush(void) * processed on a config_sched. */ int -do_config(void *p, int l) +do_config(void *p, size_t l) { struct dn_id o; union { @@ -2016,7 +2016,7 @@ do_config(void *p, int l) while (l >= sizeof(o)) { memcpy(&o, (char *)p + off, sizeof(o)); if (o.len < sizeof(o) || l < o.len) { - D("bad len o.len %d len %d", o.len, l); + D("bad len o.len %d len %zu", o.len, l); err = EINVAL; break; } @@ -2488,7 +2488,8 @@ ip_dn_ctl(struct sockopt *sopt) { struct epoch_tracker et; void *p = NULL; - int error, l; + size_t l; + int error; error = priv_check(sopt->sopt_td, PRIV_NETINET_DUMMYNET); if (error) @@ -2517,14 +2518,14 @@ ip_dn_ctl(struct sockopt *sopt) error = ip_dummynet_compat(sopt); break; - case IP_DUMMYNET3 : + case IP_DUMMYNET3: if (sopt->sopt_dir == SOPT_GET) { error = dummynet_get(sopt, NULL); break; } l = sopt->sopt_valsize; if (l < sizeof(struct dn_id) || l > 12000) { - D("argument len %d invalid", l); + D("argument len %zu invalid", l); break; } p = malloc(l, M_TEMP, M_NOWAIT); @@ -2533,9 +2534,8 @@ ip_dn_ctl(struct sockopt *sopt) break; } error = sooptcopyin(sopt, p, l, l); - if (error) - break ; - error = do_config(p, l); + if (error == 0) + error = do_config(p, l); break; }