From patchwork Tue Dec 14 21:57:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12676791 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD22EC433FE for ; Tue, 14 Dec 2021 21:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237843AbhLNV5o (ORCPT ); Tue, 14 Dec 2021 16:57:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232557AbhLNV5o (ORCPT ); Tue, 14 Dec 2021 16:57:44 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0737C06173F for ; Tue, 14 Dec 2021 13:57:43 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id p3-20020a05600c1d8300b003334fab53afso17227899wms.3 for ; Tue, 14 Dec 2021 13:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2QyzlaEvGftgMM8DTXQodMrr/OBpAbRBg3r+WHz53PU=; b=UkIn6MuatFncBY4nnc6Ob1g/v+sstRf43AWf8CSJ9LarrthuyEpzEUO9/JfVDYN1hQ R0NjN60m8xrB6vUnHIHW2ur6FmzgVsTeqScRQs+xvVhUq8jG5GezLfIJzJqvEESh/FWZ HSUc+5FDjTOLhG/+ntOmTM6/Q/NL4+JzWUOhzQq2ukFCZguoLcfXs66B3poauVd8tNgz QbiGUfq3LMonzwZnHhOphoP/sBwQT1+hEMdrFm/lfbh8IZfOKEJKZB7e+MB1S6Kf6qj8 l2EjqlyyM9t1e7je/VjzpRBKKszneyrdOzNzeqAqeCgnIzPtY3e8WUSWdHfl4w0T+mbl KK6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2QyzlaEvGftgMM8DTXQodMrr/OBpAbRBg3r+WHz53PU=; b=z8BFhR/MZeGxDKzKwrA3vduSl0OyDVqQqlQoBqc74O6i8/SyznL5oZ73SFRgFKqoyJ E+Nxijpza7GUyfVBANF1S0PP7mlZWLxJUulXCwt42MaU5g6UVE4/Vcvg6ah0bNUzHL3j MPLwCah/AGiarX8pG3//Wvf4Izs7iQ029PuoZqLeJBJ0lqW6U9IU7z5egVdWGYTqyx/q 2h7L+5EZ4qwcXfaVRI7N55JbqlnUulI5iQQGpIMEmf+dylrrElkDf/ZNgkotMsPwgZOX 3Z5u4oKszJQS5DLSmCfm6NWBKB/GqLyGN8eW6cbH2CrH7cTqFfHMZHAOR2QAi2oxtxAh 3OLw== X-Gm-Message-State: AOAM532flSh5xreRhb1QN95AzFyUoYqqNiuV3LFPRRT/HCIsXNbsQVsu PIWav71bfBN1nJEaUe1G8xLedQ== X-Google-Smtp-Source: ABdhPJx2yH+Z25DQk22J6l9wWexwTfXulU5Erm2Nt5fUwPzVzm5FrUE1F7Fv1r3tHCrukQP1gYIK1g== X-Received: by 2002:a05:600c:35c8:: with SMTP id r8mr1862972wmq.8.1639519062161; Tue, 14 Dec 2021 13:57:42 -0800 (PST) Received: from localhost.localdomain ([2.31.167.18]) by smtp.gmail.com with ESMTPSA id d15sm145504wri.50.2021.12.14.13.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 13:57:41 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Vlad Yasevich , Neil Horman , Marcelo Ricardo Leitner , "David S. Miller" , Jakub Kicinski , lksctp developers , "H.P. Yarroll" , Karl Knutson , Jon Grimm , Xingang Guo , Hui Huang , Sridhar Samudrala , Daisy Chang , Ryan Layer , Kevin Gao , netdev@vger.kernel.org Subject: [RESEND 1/2] sctp: export sctp_endpoint_{hold,put}() for use by seperate modules Date: Tue, 14 Dec 2021 21:57:31 +0000 Message-Id: <20211214215732.1507504-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org net/sctp/diag.c for instance is built into its own separate module (sctp_diag.ko) and requires the use of sctp_endpoint_{hold,put}() in order to prevent a recently found use-after-free issue. Cc: Vlad Yasevich Cc: Neil Horman Cc: Marcelo Ricardo Leitner Cc: "David S. Miller" Cc: Jakub Kicinski Cc: lksctp developers Cc: "H.P. Yarroll" Cc: Karl Knutson Cc: Jon Grimm Cc: Xingang Guo Cc: Hui Huang Cc: Sridhar Samudrala Cc: Daisy Chang Cc: Ryan Layer Cc: Kevin Gao Cc: linux-sctp@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones --- net/sctp/endpointola.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c index 48c9c2c7602f7..7c36056f3a1b4 100644 --- a/net/sctp/endpointola.c +++ b/net/sctp/endpointola.c @@ -226,6 +226,7 @@ void sctp_endpoint_hold(struct sctp_endpoint *ep) { refcount_inc(&ep->base.refcnt); } +EXPORT_SYMBOL_GPL(sctp_endpoint_hold); /* Release a reference to an endpoint and clean up if there are * no more references. @@ -235,6 +236,7 @@ void sctp_endpoint_put(struct sctp_endpoint *ep) if (refcount_dec_and_test(&ep->base.refcnt)) sctp_endpoint_destroy(ep); } +EXPORT_SYMBOL_GPL(sctp_endpoint_put); /* Is this the endpoint we are looking for? */ struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *ep, From patchwork Tue Dec 14 21:57:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12676793 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90956C433FE for ; Tue, 14 Dec 2021 21:57:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237876AbhLNV5v (ORCPT ); Tue, 14 Dec 2021 16:57:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237859AbhLNV5u (ORCPT ); Tue, 14 Dec 2021 16:57:50 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEB30C061401 for ; Tue, 14 Dec 2021 13:57:49 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id j140-20020a1c2392000000b003399ae48f58so17217180wmj.5 for ; Tue, 14 Dec 2021 13:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9MfX+ladgz8v1uPlUvt81YDUVI2BVYjumD0vKwEPZL8=; b=BhWidKBfmgrjGVv/oY0GDjzoCL5/Q2qN6A79H6xM62P3jXEXAv++tUlOkzZXbXJnk8 sROX/XNW+QKZGMqx/Gw2jKcpHJXj4H5V82l0yo2u5tDzLW2a7ZJJxr6HkkB0+muYG1r7 7lyPdlY9fwmfr38AkL75uOM8n/1mUpKYgBV1IcRSrCrG8wPeeAwkP9JWATdSSxsKduRG ZXBgvV5x+YhEjHfJ9XqhrbUzXoohY+NJPh8Wi5hJUFdJWfzB0I+AIyNO/hV3F913Aeop 0haLJQsW6Z4VBHvdtJZKr0KezBpd3t9LFCn3cG8m/x6Fa8fsoHM+dT7cS3rmWIaZVoXK gj1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9MfX+ladgz8v1uPlUvt81YDUVI2BVYjumD0vKwEPZL8=; b=J1cdt44ClVuaEoo6gd6fZBjkM2F5Cjx9JGKUmTnNXVwrx3m2aOZETWjviuFWVg4yH6 sRa7NABsqlGekwqySX7tkQ1MWgzcqVS/WHcAQHzJM3YVPvL/w73cS2jicNuW05oI/yAX TtIiig43CHZJRa5Cz8V1eyqrjRIJ3VLjNW8uF1kGzFpx9mpFgQc1smcndwKXVMjirfon Yk+U1621KwNW4DSEjl5VZRoHh586pWtEMax4LzFxfxSmC0houwgvqYSk1RL9hxgImTPD bidnLKZ2LrQwUCFmTcLctBjkUy4G1lxZ3ztYA0nVxR5e6GtiLaHXQCGhgg7sFCObl8M0 3aRg== X-Gm-Message-State: AOAM5339Obv6s04wpZ3b7uBEop/fUP0N2Ebxp6p1Vzj+x90R9ItwqVo+ fu6TI1o0KTOYExCC4zWbiuhifw== X-Google-Smtp-Source: ABdhPJz7qmxWYBTp7JcFCybMxQtt+sxDtbSZTMMz88gge/982Wnt68vu1s+GExEaWLcWfLmdNMdecg== X-Received: by 2002:a1c:4d03:: with SMTP id o3mr1916103wmh.3.1639519068421; Tue, 14 Dec 2021 13:57:48 -0800 (PST) Received: from localhost.localdomain ([2.31.167.18]) by smtp.gmail.com with ESMTPSA id d15sm145504wri.50.2021.12.14.13.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 13:57:47 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, Vlad Yasevich , Neil Horman , Marcelo Ricardo Leitner , "David S. Miller" , Jakub Kicinski , lksctp developers , "H.P. Yarroll" , Karl Knutson , Jon Grimm , Xingang Guo , Hui Huang , Sridhar Samudrala , Daisy Chang , Ryan Layer , Kevin Gao , netdev@vger.kernel.org Subject: [RESEND 2/2] sctp: hold cached endpoints to prevent possible UAF Date: Tue, 14 Dec 2021 21:57:32 +0000 Message-Id: <20211214215732.1507504-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog In-Reply-To: <20211214215732.1507504-1-lee.jones@linaro.org> References: <20211214215732.1507504-1-lee.jones@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The cause of the resultant dump_stack() reported below is a dereference of a freed pointer to 'struct sctp_endpoint' in sctp_sock_dump(). This race condition occurs when a transport is cached into its associated hash table followed by an endpoint/sock migration to a new association in sctp_assoc_migrate() prior to their subsequent use in sctp_diag_dump() which uses sctp_for_each_transport() to walk the hash table calling into sctp_sock_dump() where the dereference occurs. BUG: KASAN: use-after-free in sctp_sock_dump+0xa8/0x438 [sctp_diag] Call trace: dump_backtrace+0x0/0x2dc show_stack+0x20/0x2c dump_stack+0x120/0x144 print_address_description+0x80/0x2f4 __kasan_report+0x174/0x194 kasan_report+0x10/0x18 __asan_load8+0x84/0x8c sctp_sock_dump+0xa8/0x438 [sctp_diag] sctp_for_each_transport+0x1e0/0x26c [sctp] sctp_diag_dump+0x180/0x1f0 [sctp_diag] inet_diag_dump+0x12c/0x168 netlink_dump+0x24c/0x5b8 __netlink_dump_start+0x274/0x2a8 inet_diag_handler_cmd+0x224/0x274 sock_diag_rcv_msg+0x21c/0x230 netlink_rcv_skb+0xe0/0x1bc sock_diag_rcv+0x34/0x48 netlink_unicast+0x3b4/0x430 netlink_sendmsg+0x4f0/0x574 sock_write_iter+0x18c/0x1f0 do_iter_readv_writev+0x230/0x2a8 do_iter_write+0xc8/0x2b4 vfs_writev+0xf8/0x184 do_writev+0xb0/0x1a8 __arm64_sys_writev+0x4c/0x5c el0_svc_common+0x118/0x250 el0_svc_handler+0x3c/0x9c el0_svc+0x8/0xc To prevent this from happening we need to take a references to the to-be-used/dereferenced 'struct sock' and 'struct sctp_endpoint's until such a time when we know it can be safely released. When KASAN is not enabled, a similar, but slightly different NULL pointer derefernce crash occurs later along the thread of execution in inet_sctp_diag_fill() this time. Cc: Vlad Yasevich Cc: Neil Horman Cc: Marcelo Ricardo Leitner Cc: "David S. Miller" Cc: Jakub Kicinski Cc: lksctp developers Cc: "H.P. Yarroll" Cc: Karl Knutson Cc: Jon Grimm Cc: Xingang Guo Cc: Hui Huang Cc: Sridhar Samudrala Cc: Daisy Chang Cc: Ryan Layer Cc: Kevin Gao Cc: linux-sctp@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones --- net/sctp/diag.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/sctp/diag.c b/net/sctp/diag.c index 760b367644c12..2029b240b6f24 100644 --- a/net/sctp/diag.c +++ b/net/sctp/diag.c @@ -301,6 +301,8 @@ static int sctp_sock_dump(struct sctp_transport *tsp, void *p) struct sctp_association *assoc; int err = 0; + sctp_endpoint_hold(ep); + sock_hold(sk); lock_sock(sk); list_for_each_entry(assoc, &ep->asocs, asocs) { if (cb->args[4] < cb->args[1]) @@ -341,6 +343,8 @@ static int sctp_sock_dump(struct sctp_transport *tsp, void *p) cb->args[4] = 0; release: release_sock(sk); + sock_put(sk); + sctp_endpoint_put(ep); return err; }