From nobody Thu Mar 30 08:47:01 2023 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 4PnH912qDXz42gyL; Thu, 30 Mar 2023 08:47:01 +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 4PnH912B39z4DL4; Thu, 30 Mar 2023 08:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680166021; 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=3AVt/OmkIQ2noNdF9GYhQ67S4Fc9z6e2LMs0aeBjbiw=; b=N2YgYJTYGPWQn8mAOtlk5Ysp4HxIV4wjBnloT1poxI5sOAUlxCVPclNkt49A/aNHY6DsFA u20kL3KmCxdR1z8MA73J4D3lJsD+ISmfcIYV0rTWYX+EWGGbHwO1eMkxeysvGj9fMNiwZ5 Gvn7wKzKq681Tfd39o99hL25gxrW9weAN9GMBP8wRyazyUx22p1ec+1YV85xal7vcb9j8W h9X0CG4IdiltxzSzscFwtILHyapKSOKxv9eqHGb3CanaZat9q0TK6WwwLe3qD+uC1aH+bo kMC7DsjvcXjAxfjo6YFl6DQJYItIzKU9/kf1MYCh85se/Ms0ZULJNPaBwuEOSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680166021; 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=3AVt/OmkIQ2noNdF9GYhQ67S4Fc9z6e2LMs0aeBjbiw=; b=LwBQGyOJj1k5NL/Vsce0lSgBIIm65+1AIXh/FDizZW5WdsCLZS+FyaQLptlaraICybALOf lCMwKqFV1F/LLGhrh/DaVmDj1nxVj+RSdiX81/XzpxwqtkQ8ReFQj/K/EknQmnmhuLAKrf WfVzmwnFU43r0HXkDcM/hASGQ10WUJhkeD2qOk9F7rQWdQqmv0gVe/rqYpxx9gFGm5kjtr LKNQ4J0YcanPXHtDqdaU4sUbbpXU0y9CUQcrJjzpFD7063Y598ZUogg/MJx6T1qF6DhXAi 60ZOX/fXvk3bNVU9mlhxuJW8VMI5EeoCIOzvrH/kYzjmLNnjoOVWcC2BteRtjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680166021; a=rsa-sha256; cv=none; b=WNML2yTw2TuoeHwjDZdCbDFG4hTCI0hra1V6pE7QKQ23JOrpK9rBiPmGXB4vGlYT5i2bdO JtSuVuZ0SfmrOV9h5RbMKFiVRVreAuQ/etC9cpaSw/WLyPnYjckmb+h5dD4vf5xq9YoNma xL2Sex164aKPTr2XXRMmFZcmOBOWhW0lz0jsOFHKGxo+5sSnLJWS6L7mEnbXMaD2j0GXp6 MJi3KBNoK7A7tF7bp4YgAqdKsMuKJOT0V4BYPX5CQoiSWEgUbPYBNVdRUFS+aqJpJg9t6J 8+Vgm/Px1wcL5TNggBNTv8c/IQvVTmuBoyp3gfNw+YwHyIoYscHb2nl/+fb8bg== 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 4PnH911CgTz14vp; Thu, 30 Mar 2023 08:47:01 +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 32U8l1tl004220; Thu, 30 Mar 2023 08:47:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32U8l1UM004219; Thu, 30 Mar 2023 08:47:01 GMT (envelope-from git) Date: Thu, 30 Mar 2023 08:47:01 GMT Message-Id: <202303300847.32U8l1UM004219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: f5a365e51fee - main - inet6: protect address manipulation with a lock 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5a365e51feea75d1e5ebc86c53808d8cae7b6d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a365e51feea75d1e5ebc86c53808d8cae7b6d7 commit f5a365e51feea75d1e5ebc86c53808d8cae7b6d7 Author: Mateusz Guzik AuthorDate: 2023-03-29 12:46:41 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-30 08:46:38 +0000 inet6: protect address manipulation with a lock This is a total hack/bare minimum which follows inet4. Otherwise 2 threads removing the same address can easily crash. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39317 --- sys/netinet6/in6.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 27dc3550177c..3d967e9a40c7 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -168,6 +168,9 @@ static void in6_leave_proxy_ndp_mc(struct ifnet *, const struct in6_addr *); #define ifa2ia6(ifa) ((struct in6_ifaddr *)(ifa)) #define ia62ifa(ia6) (&((ia6)->ia_ifa)) +static struct sx in6_control_sx; +SX_SYSINIT(in6_control_sx, &in6_control_sx, "in6_control"); + void in6_newaddrmsg(struct in6_ifaddr *ia, int cmd) { @@ -254,6 +257,7 @@ in6_control(struct socket *so, u_long cmd, void *data, struct in6_aliasreq *ifra = (struct in6_aliasreq *)data; struct sockaddr_in6 *sa6; int error; + bool control_locked = false; /* * Compat to make pre-10.x ifconfig(8) operable. @@ -411,6 +415,8 @@ in6_control(struct socket *so, u_long cmd, void *data, if (td != NULL && (error = prison_check_ip6(td->td_ucred, &sa6->sin6_addr)) != 0) return (error); + sx_xlock(&in6_control_sx); + control_locked = true; ia = in6ifa_ifpwithaddr(ifp, &sa6->sin6_addr); } else ia = NULL; @@ -582,6 +588,9 @@ in6_control(struct socket *so, u_long cmd, void *data, error = 0; out: + if (control_locked) + sx_xunlock(&in6_control_sx); + if (ia != NULL) ifa_free(&ia->ia_ifa); return (error);