From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4FDE2D63F8 for ; Mon, 22 Jun 2026 21:03:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782162217; cv=none; b=Bv+RsLTWXhxo0vApszRDPWcu4JU0BIKbV0jzk0ZADU0jzCxmdLGicdlLElOB9XO9FIvyuJ8sUgR7whq7wvm/5J+ESXORDoso01TWETSqD7mmQbkVaBVJBaP7GYVilPjd/0aWCTh38rAp8dPIqS9KNJoAqd2saw9J7xK60VQfvNk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782162217; c=relaxed/simple; bh=JqC3pq7NIWbTtr2/fYT4t/8plFRvdglrTV+xjsQtjcY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s/V0JoIWtviJVu+ibsSf0AmLckRoAgzpgL0PgKjn9nvyP6S616xahLP3CPyYFY4n0IM/Dtb0nrvgpuIJUMrmwO0WkhcAO+PJ2V/Yy3tMvotDdlGBhopp49gQtoLw4arjHEUqyFClQhxRROhjOlG9eUk9RWPdljKClv1W1ncuXO4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iYZmUNfW; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iYZmUNfW" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-490b64c8311so46334325e9.3 for ; Mon, 22 Jun 2026 14:03:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782162213; x=1782767013; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i+hBnMxhJkO6FDQAL0eqBCFsfSLziGXalyqU7rpqVDw=; b=iYZmUNfWGkDg81+a6uErbhY/9LOBD1YpkxGR/QJTIPUghu8pBwdDDyYu3M6p+sJTe3 rM437Vl30ieukUqUF5kC7XD3oj9Ic2GXwUeSO9eCBy2HdPjmj2d6W8IRil49BufCYslJ Yu09PfEW4gXCd5wy68DCOoO998vcybgRJoud56vf5DNTLnZwWPH6bpmKbeE0dq3LlATS kRQERQ4LLi85sWi9OZ1I+kZZl96WMyiZzqWGEbMctpWTeW5cI+IMJCWCb6kgsiGIQxas cmIfXBXkYxptO2PHPo95jAjN0ZmQFZY5wfFt5VNOs5aTYUQZeVB2el42d6HLGK/Ls47K a3YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782162213; x=1782767013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=i+hBnMxhJkO6FDQAL0eqBCFsfSLziGXalyqU7rpqVDw=; b=m+uwrGv4vXLIiOJWDHt+77gOA8lfQuFVtJnKI/4kbw/idxW0kX+qH7r6eq+HUCWrEi bdMbzAg8kfFZes3qY7sofQZTq/D4Ce8z0+TzgMVu07Ny4toesgEHD0SLzn9Zb+tWwMS8 Y8SgDGR4pt+h7yHIak86g8sXKAGFcchz2IY3d5IytacKVqhLpw6vNR7TX1qTuPYtMPvG 6Wte8rt0nIsqKxGci7OIHBbKTegT9xpJDRRZukIoMiaeXlTi6qHhRUbgW1iPJ0S6Q50X pxx2iBAb8eQfww/ajhXDdvFJx6yqHAKME2tUrcAE7hRdqe9lDK1zJlQ0A5ITOXnwuYNe ZQYA== X-Forwarded-Encrypted: i=1; AFNElJ+D30ZAZviI7uxuze/AzV+pK6pBt2s+KYYEFNKT7NqcHB/AZXDX9kjclWYB3nHf/jaXhPJxhbHs6IxYtKo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy/CnX+3jQ+TqAaZ0Y48WnYcJmllh18aZzDQ+3gp7/rj9TPTed8 cELN61AdDnfaWbCeX0QS/foip7i4871F7qaUkvh4sJ9YRzzO+P9KqCg= X-Gm-Gg: AfdE7ck9pEL/K2KMqsgEWqhsnSsnaCZCVBJo9x+QspSOAkWSI7ad2hRzrlyTVO0lAK3 SUJ6kbcc6ZvRSLoG4KuHw4lNuMdhoMBcbTF/C13j22lH6lMeN5iZQFOFbtb8RsoZaAMN0Kh3HgC NLnf3bRwcFkRS1kx4Azp4pg5/Ef5LMqzLGt3ZsF+1M6/3RN5OeAfcAE6Llw3/7OkZ/pHqX4kVXn EPkKikrdSmmrI7OAcSovRvE1tb34Vwz0dJJb8z37CV+ZwPfrqFIgf1CbXVB0As75R8cdSOU/7DH T5h+ZNgz8DfgdPOItagehwQPUbpNqH+Fn+h7NFX9c8ZtlcnqEwYC6kSzSc/Xf1+MOLJf5O+74Zs Tx7R51w9vJvJ7w0quD95YcohWDrX7qwOhXfuT49jHrdl8V5S76l2xMTRDxA== X-Received: by 2002:a05:600c:e548:20b0:492:3e69:a86f with SMTP id 5b1f17b1804b1-49240df7dafmr179983725e9.1.1782162213270; Mon, 22 Jun 2026 14:03:33 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49245bba787sm198208495e9.1.2026.06.22.14.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 14:03:31 -0700 (PDT) From: Tristan Madani To: Paul Moore , Stephen Smalley Cc: Ondrej Mosnacek , Richard Haines , selinux@vger.kernel.org, stable@vger.kernel.org, linux-kernel@vger.kernel.org, tristan@talencesecurity.com Subject: [PATCH v2] selinux: avoid sk_socket dereference in selinux_sctp_bind_connect() Date: Mon, 22 Jun 2026 21:03:30 +0000 Message-ID: <20260622210330.3187099-1-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260618232149.1780219-1-tristmd@gmail.com> References: <20260618232149.1780219-1-tristmd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Tristan Madani selinux_sctp_bind_connect() dereferences sk->sk_socket to pass a struct socket * to selinux_socket_bind() and selinux_socket_connect_helper(). However, when the hook is invoked from the ASCONF softirq path (sctp_process_asconf), there is no file reference guaranteeing that sk->sk_socket is non-NULL. The setsockopt callers (bindx, connectx, set_primary, sendmsg connect) hold a file reference and are not affected. Both selinux_socket_bind() and selinux_socket_connect_helper() immediately resolve sock->sk, never using the struct socket * for anything else. Refactor the inner logic into helpers that take a struct sock * directly so that selinux_sctp_bind_connect() never needs to touch sk->sk_socket at all. Suggested-by: Stephen Smalley Fixes: d452930fd3b9 ("selinux: Add SCTP support") Cc: stable@vger.kernel.org Signed-off-by: Tristan Madani --- Changes in v2: - Refactor selinux_socket_bind() and selinux_socket_connect_helper() into sk-based inner helpers instead of adding a NULL check on sk->sk_socket (Stephen Smalley) security/selinux/hooks.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 1a713d96206f..aa58a17da219 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4994,9 +4994,8 @@ static int selinux_socket_socketpair(struct socket *socka, Need to determine whether we should perform a name_bind permission check between the socket and the port number. */ -static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen) +static int __selinux_socket_bind(struct sock *sk, struct sockaddr *address, int addrlen) { - struct sock *sk = sock->sk; struct sk_security_struct *sksec = selinux_sock(sk); u16 family; int err; @@ -5126,13 +5125,17 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in return -EAFNOSUPPORT; } +static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen) +{ + return __selinux_socket_bind(sock->sk, address, addrlen); +} + /* This supports connect(2) and SCTP connect services such as sctp_connectx(3) * and sctp_sendmsg(3) as described in Documentation/security/SCTP.rst */ -static int selinux_socket_connect_helper(struct socket *sock, +static int selinux_socket_connect_helper(struct sock *sk, struct sockaddr *address, int addrlen) { - struct sock *sk = sock->sk; struct sk_security_struct *sksec = selinux_sock(sk); int err; @@ -5221,7 +5224,7 @@ static int selinux_socket_connect(struct socket *sock, int err; struct sock *sk = sock->sk; - err = selinux_socket_connect_helper(sock, address, addrlen); + err = selinux_socket_connect_helper(sk, address, addrlen); if (err) return err; @@ -5706,13 +5709,10 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname, int len, err = 0, walk_size = 0; void *addr_buf; struct sockaddr *addr; - struct socket *sock; if (!selinux_policycap_extsockclass()) return 0; - /* Process one or more addresses that may be IPv4 or IPv6 */ - sock = sk->sk_socket; addr_buf = address; while (walk_size < addrlen) { @@ -5741,14 +5741,14 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname, case SCTP_PRIMARY_ADDR: case SCTP_SET_PEER_PRIMARY_ADDR: case SCTP_SOCKOPT_BINDX_ADD: - err = selinux_socket_bind(sock, addr, len); + err = __selinux_socket_bind(sk, addr, len); break; /* Connect checks */ case SCTP_SOCKOPT_CONNECTX: case SCTP_PARAM_SET_PRIMARY: case SCTP_PARAM_ADD_IP: case SCTP_SENDMSG_CONNECT: - err = selinux_socket_connect_helper(sock, addr, len); + err = selinux_socket_connect_helper(sk, addr, len); if (err) return err; -- 2.47.3