From patchwork Wed Jan 25 20:07:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuxuan Luo X-Patchwork-Id: 1731843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=GY1KtHSi; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P2FHq4Hgxz23gM for ; Thu, 26 Jan 2023 07:07:35 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pKm3N-0008Oz-DX; Wed, 25 Jan 2023 20:07:29 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pKm3L-0008O7-87 for kernel-team@lists.ubuntu.com; Wed, 25 Jan 2023 20:07:27 +0000 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 837773F5DD for ; Wed, 25 Jan 2023 20:07:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1674677241; bh=eIzgu6drc5vb9v720+XVrUnZaaAjPfyN1PUJ7J2j2H4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GY1KtHSi69UNcYTd/KUc6CM0ylvlbqv/KzX7ztNPLEFaRWKnJkeh4+U8HxMKuQt/C Hyy+Ip9tfygTC0rkL8wGyaK/3ZQ3IkfTw42xCJHSjtKZ5ktbTRgrZovTF7tTPFsv1i pn8nBYm2Agj0OHDZf/hWB1v0VmvyWiElEdxVy/2C67xJpG5d24IzghvWPk+IYedLP6 0RIjP9KWCBE2Sni7/AxwdZ4FNWxU44gXyDV2jgG4L4xeBHQevCCUIIaUge8laiUIVS BnH8hjHY4fymLAZig8iU7elcXniUeNyJjxaqKNu9j26CMiWQyrJ2oyfuanamaHLlju YJ4ww9ve9ogxw== Received: by mail-qt1-f198.google.com with SMTP id a13-20020ac8610d000000b003a8151cadebso8146141qtm.10 for ; Wed, 25 Jan 2023 12:07:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eIzgu6drc5vb9v720+XVrUnZaaAjPfyN1PUJ7J2j2H4=; b=j/bAEJ56iM7EIRS2vD8qnNyJqdYZhkGwXmu6/cxJVyOB6o62qRh0zl4hpwE9jl/awn i6XS1WY3I6sA9giIXwUJQUSjmupQxQ1JzIDvemfSM8KmsNTKYkQaWuYMFYr10DZ2HxLY 58haC65GajJM5btVVXPGW6fWVeyRM5ppoo7iwmy1OAGmuy3eQYC4g0C3UyaWUlixtdi0 y6RuYWe95IHSQ/opHzi6oS/cN0z+tG/PkmDoCodb9e3D7aCM4Z14ZOW0V5txzVvCXyp8 sGzgXiFw8giA1cGhx21v11sdOsx1+VFKBxMH8abKIljBE4Jkho85LEbIoD4ikj5V7OYY kBPw== X-Gm-Message-State: AFqh2kpkt0fP0yd7C7pPq5YJ33a1xxS8I7LAvEGQE0pWgdVFiwhUutmM CpkmPo+uYyiFusvMTA+9qPpRWWFHEPz4AJ1v38XG6okISeeUMtVHO4foBFE2J6mFtZhHYffOKdJ FcbCajHyLLn6L/JX8MDUVl+mqjBa29MBV5ycRIdnNQA== X-Received: by 2002:ac8:5444:0:b0:3ab:af8e:64e6 with SMTP id d4-20020ac85444000000b003abaf8e64e6mr40630573qtq.67.1674677239896; Wed, 25 Jan 2023 12:07:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXss5trEG+ZpGMAxgvevrr8PzGy7zOeJdpLfbZQW4vtqKp0bRuQ/HUano3Tj4XlRw2XnkKRX7A== X-Received: by 2002:ac8:5444:0:b0:3ab:af8e:64e6 with SMTP id d4-20020ac85444000000b003abaf8e64e6mr40630551qtq.67.1674677239590; Wed, 25 Jan 2023 12:07:19 -0800 (PST) Received: from cache-ubuntu.hsd1.nj.comcast.net ([2601:86:200:98b0:94b3:ae87:bcb6:3bc5]) by smtp.gmail.com with ESMTPSA id t37-20020a05622a182500b003b63c9c59easm3959083qtc.97.2023.01.25.12.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 12:07:18 -0800 (PST) From: Yuxuan Luo To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] ipv6: Fix data races around sk->sk_prot. Date: Wed, 25 Jan 2023 15:07:15 -0500 Message-Id: <20230125200715.25524-2-yuxuan.luo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230125200715.25524-1-yuxuan.luo@canonical.com> References: <20230125200715.25524-1-yuxuan.luo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Kuniyuki Iwashima Commit 086d49058cd8 ("ipv6: annotate some data-races around sk->sk_prot") fixed some data-races around sk->sk_prot but it was not enough. Some functions in inet6_(stream|dgram)_ops still access sk->sk_prot without lock_sock() or rtnl_lock(), so they need READ_ONCE() to avoid load tearing. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Kuniyuki Iwashima Signed-off-by: Jakub Kicinski (cherry picked from commit 364f997b5cfe1db0d63a390fe7c801fa2b3115f6) CVE-2022-3567 Signed-off-by: Yuxuan Luo --- net/core/sock.c | 6 ++++-- net/ipv4/af_inet.c | 23 ++++++++++++++++------- net/ipv6/ipv6_sockglue.c | 4 ++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 788c1372663c..9c05637663bf 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3556,7 +3556,8 @@ int sock_common_getsockopt(struct socket *sock, int level, int optname, { struct sock *sk = sock->sk; - return sk->sk_prot->getsockopt(sk, level, optname, optval, optlen); + /* IPV6_ADDRFORM can change sk->sk_prot under us. */ + return READ_ONCE(sk->sk_prot)->getsockopt(sk, level, optname, optval, optlen); } EXPORT_SYMBOL(sock_common_getsockopt); @@ -3582,7 +3583,8 @@ int sock_common_setsockopt(struct socket *sock, int level, int optname, { struct sock *sk = sock->sk; - return sk->sk_prot->setsockopt(sk, level, optname, optval, optlen); + /* IPV6_ADDRFORM can change sk->sk_prot under us. */ + return READ_ONCE(sk->sk_prot)->setsockopt(sk, level, optname, optval, optlen); } EXPORT_SYMBOL(sock_common_setsockopt); diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 7f6d7c355e38..6f8bffacd45f 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -558,22 +558,27 @@ int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags) { struct sock *sk = sock->sk; + const struct proto *prot; int err; if (addr_len < sizeof(uaddr->sa_family)) return -EINVAL; + + /* IPV6_ADDRFORM can change sk->sk_prot under us. */ + prot = READ_ONCE(sk->sk_prot); + if (uaddr->sa_family == AF_UNSPEC) - return sk->sk_prot->disconnect(sk, flags); + return prot->disconnect(sk, flags); if (BPF_CGROUP_PRE_CONNECT_ENABLED(sk)) { - err = sk->sk_prot->pre_connect(sk, uaddr, addr_len); + err = prot->pre_connect(sk, uaddr, addr_len); if (err) return err; } if (data_race(!inet_sk(sk)->inet_num) && inet_autobind(sk)) return -EAGAIN; - return sk->sk_prot->connect(sk, uaddr, addr_len); + return prot->connect(sk, uaddr, addr_len); } EXPORT_SYMBOL(inet_dgram_connect); @@ -734,10 +739,11 @@ EXPORT_SYMBOL(inet_stream_connect); int inet_accept(struct socket *sock, struct socket *newsock, int flags, bool kern) { - struct sock *sk1 = sock->sk; + struct sock *sk1 = sock->sk, *sk2; int err = -EINVAL; - struct sock *sk2 = sk1->sk_prot->accept(sk1, flags, &err, kern); + /* IPV6_ADDRFORM can change sk->sk_prot under us. */ + sk2 = READ_ONCE(sk1->sk_prot)->accept(sk1, flags, &err, kern); if (!sk2) goto do_err; @@ -827,12 +833,15 @@ ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags) { struct sock *sk = sock->sk; + const struct proto *prot; if (unlikely(inet_send_prepare(sk))) return -EAGAIN; - if (sk->sk_prot->sendpage) - return sk->sk_prot->sendpage(sk, page, offset, size, flags); + /* IPV6_ADDRFORM can change sk->sk_prot under us. */ + prot = READ_ONCE(sk->sk_prot); + if (prot->sendpage) + return prot->sendpage(sk, page, offset, size, flags); return sock_no_sendpage(sock, page, offset, size, flags); } EXPORT_SYMBOL(inet_sendpage); diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index b61066ac8648..0acdd9ee2399 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -481,7 +481,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, sock_prot_inuse_add(net, sk->sk_prot, -1); sock_prot_inuse_add(net, &tcp_prot, 1); - /* Paired with READ_ONCE(sk->sk_prot) in net/ipv6/af_inet6.c */ + /* Paired with READ_ONCE(sk->sk_prot) in inet6_stream_ops */ WRITE_ONCE(sk->sk_prot, &tcp_prot); icsk->icsk_af_ops = &ipv4_specific; sk->sk_socket->ops = &inet_stream_ops; @@ -496,7 +496,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, sock_prot_inuse_add(net, sk->sk_prot, -1); sock_prot_inuse_add(net, prot, 1); - /* Paired with READ_ONCE(sk->sk_prot) in net/ipv6/af_inet6.c */ + /* Paired with READ_ONCE(sk->sk_prot) in inet6_dgram_ops */ WRITE_ONCE(sk->sk_prot, prot); sk->sk_socket->ops = &inet_dgram_ops; sk->sk_family = PF_INET;