From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BFFE248BD0; Wed, 15 Jan 2025 10:58:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736938687; cv=none; b=lnuPlNu9vcngpt8jxk1lNuiPwWdC8SwuJu+Cu7+QdNaAFyUmY82ezJMyNIvdFRkksEIhdYKZfUi11x1XRFQoHe6GKwXfHouLoa4qZ8e1fNwvBVla81haYu8u33hNYxqjlqWEnapC2+tFELmLZX+ffcVwdK9Gv/T2gHBE4l20K0c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736938687; c=relaxed/simple; bh=ZO99xXDQbAmpLkkFke9iXr9qOvBhWiyoeM5IISgttaE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mhLlgvZmImtxWao1mmGzhlcnCHhg5+U4SvldPkh2y0q8MAI2T4zQEgis5Nx1gCvC4sx8KkoAIJdl4idKZXNbFJKg/l9rr70TfRrXDPPgkSn7hG+FtT2O2eJIifk6tvSjJEvi+NjgQdgOQrQVQw/BDCvgcuHwDshw2MbBQJGFLko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mfBN826l; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mfBN826l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81129C4CEDF; Wed, 15 Jan 2025 10:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1736938687; bh=ZO99xXDQbAmpLkkFke9iXr9qOvBhWiyoeM5IISgttaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mfBN826l3bJQK77PxoGWuKjx3zlQ2VOXvI/hy47Y3pEBRbRx49iuTOe7NraVpXJR6 lGi1SUa0y/O9hz0AfZuKyZo51W0tQkPwuUFiyIRLYrK1ikBWwxdBozau7eoqsvbJKq sqaNG9Rsnb2dM+BQEZkPNFm9vR/s+eIRCA5jfkzc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Al Viro , "Matthieu Baerts (NGI0)" , Jakub Kicinski Subject: [PATCH 6.6 065/129] sctp: sysctl: udp_port: avoid using current->nsproxy Date: Wed, 15 Jan 2025 11:37:20 +0100 Message-ID: <20250115103556.972385402@linuxfoundation.org> X-Mailer: git-send-email 2.48.0 In-Reply-To: <20250115103554.357917208@linuxfoundation.org> References: <20250115103554.357917208@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthieu Baerts (NGI0) commit c10377bbc1972d858eaf0ab366a311b39f8ef1b6 upstream. As mentioned in a previous commit of this series, using the 'net' structure via 'current' is not recommended for different reasons: - Inconsistency: getting info from the reader's/writer's netns vs only from the opener's netns. - current->nsproxy can be NULL in some cases, resulting in an 'Oops' (null-ptr-deref), e.g. when the current task is exiting, as spotted by syzbot [1] using acct(2). The 'net' structure can be obtained from the table->data using container_of(). Note that table->data could also be used directly, but that would increase the size of this fix, while 'sctp.ctl_sock' still needs to be retrieved from 'net' structure. Fixes: 046c052b475e ("sctp: enable udp tunneling socks") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/67769ecb.050a0220.3a8527.003f.GAE@google.com [1] Suggested-by: Al Viro Signed-off-by: Matthieu Baerts (NGI0) Link: https://patch.msgid.link/20250108-net-sysctl-current-nsproxy-v1-7-5df34b2083e8@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/sctp/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sctp/sysctl.c +++ b/net/sctp/sysctl.c @@ -532,7 +532,7 @@ static int proc_sctp_do_auth(struct ctl_ static int proc_sctp_do_udp_port(struct ctl_table *ctl, int write, void *buffer, size_t *lenp, loff_t *ppos) { - struct net *net = current->nsproxy->net_ns; + struct net *net = container_of(ctl->data, struct net, sctp.udp_port); unsigned int min = *(unsigned int *)ctl->extra1; unsigned int max = *(unsigned int *)ctl->extra2; struct ctl_table tbl;