From patchwork Mon Sep 25 07:35:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Jinchao X-Patchwork-Id: 144251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1042042vqu; Mon, 25 Sep 2023 00:50:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEtF8Dnr869Ko95ZA7PZzvIk2wd7p6LzS6bjRPAIOpwZ/sznK10uVqenqo0kwZ+17Gf9joX X-Received: by 2002:a17:903:24d:b0:1c3:2423:8e24 with SMTP id j13-20020a170903024d00b001c324238e24mr5987587plh.8.1695628208537; Mon, 25 Sep 2023 00:50:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695628208; cv=none; d=google.com; s=arc-20160816; b=ETQRVKS48volfdA4kNKKy5QAoUcCqp9z7Xax8XQxuOK7PIhxphbd5Kzrsdw2Q5z5cd XP6tbvY7eqV36nqpGq+Jvd9b4z3Rxm1yAMqJrftTHMWVXnSaBjIbglcYMFRuytjH5lgR BWOKEVPLqSz8n3VUBc/3KbWlyMy/VX8XT8qMgt1iastCV6SmjsqJw8on5qeRpI8wIch+ rD6/t0/Nv5PJ8MT6Pueu8utM3PWNw8xU1c6LoMk8UUtGXT5L85/qvYQdC1t6YufBulME 7K5HLGrGUiv+wOnBA3ncCQpqUf0KLyIPVS21E14rqAkN7VSKeQz0hUw1b+AGC/7EXe1g FSaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date; bh=NRZfEirTyicm0+r3sHkwm3wUYm2Ve0tvh5NbPSA55YU=; fh=7F+ruHH5QcOTmRba7j1bGKOB4p1lK5yntKtecISCuVs=; b=DOkEhclRDcjsWoCNBhnyBnp97wZLcWoa3xFilphtNbkAlsjW6OaTwmOAVI9Yw29lHT hLOxAXiQHuPOwDY3VHm4gHPmoOEL5NphrKefuYgsPk/KCP15Rcz6MzdvMf7vrreutswp VCPnVMQqf2lqOL4/uLd08QrR1QM2KGIt4WVPCwaw+Hhym5cUj1uwVfmJryB8B3FlqcTs 4A9j7g9oQpP1vNJQ9OA/Wo2Ekco6Zev43eDkP4m5GjOuZlCHUwjI6UNV2o2jfCC/HIQ3 MXWZ3D3SIqJqwcP0Edk68+XhD6PBorVsdJSYNFe2W5yXgX2KnVxEl6rCA8T5uTVt1r7B /h2A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id u17-20020a170903125100b001b89fd6bec4si9988239plh.144.2023.09.25.00.50.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 00:50:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 1D5DD80746A7; Mon, 25 Sep 2023 00:36:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231393AbjIYHgW (ORCPT + 30 others); Mon, 25 Sep 2023 03:36:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229709AbjIYHgT (ORCPT ); Mon, 25 Sep 2023 03:36:19 -0400 Received: from wxsgout04.xfusion.com (wxsgout03.xfusion.com [36.139.52.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34B42DA; Mon, 25 Sep 2023 00:36:10 -0700 (PDT) Received: from wuxshcsitd00600.xfusion.com (unknown [10.32.133.213]) by wxsgout04.xfusion.com (SkyGuard) with ESMTPS id 4RvF492VnMz9xk16; Mon, 25 Sep 2023 15:34:01 +0800 (CST) Received: from localhost (10.82.147.3) by wuxshcsitd00600.xfusion.com (10.32.133.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Mon, 25 Sep 2023 15:35:59 +0800 Date: Mon, 25 Sep 2023 15:35:58 +0800 From: Wang Jinchao To: Steffen Klassert , Daniel Jordan , , CC: Subject: [PATCH] padata: Fix the UAF issue related to parallel_data Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Originating-IP: [10.82.147.3] X-ClientProxiedBy: wuxshcsitd00601.xfusion.com (10.32.135.241) To wuxshcsitd00600.xfusion.com (10.32.133.213) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 25 Sep 2023 00:36:25 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777995044276321197 X-GMAIL-MSGID: 1777995044276321197 In a high-load arm64 environment, the pcrypt_aead01 test in LTP can lead to system UAF (Use-After-Free) issues. Due to the lengthy analysis of the pcrypt_aead01 function call, I'll describe the problem scenario using a simplified model: Suppose there's a user of padata named `user_function` that adheres to the padata requirement of calling `padata_free_shell` after `serial()` has been invoked, as demonstrated in the following code: ```c struct request { struct padata_priv padata; struct completion *done; }; void parallel(struct padata_priv *padata) { do_something(); } void serial(struct padata_priv *padata) { struct request *request = container_of(padata, struct request, padata); complete(request->done); } void user_function() { DECLARE_COMPLETION(done) padata->parallel = parallel() padata_do_parallel(); wait_for_completion(&done); padata_free_shell(); } ``` In the corresponding padata.c file, there's the following code: ```c static void padata_serial_worker(struct work_struct *serial_work) { ... cnt = 0; while (!list_empty(&local_list)) { ... padata->serial(padata); cnt++; } local_bh_enable(); if (refcount_sub_and_test(cnt, &pd->refcnt)) padata_free_pd(pd); } ``` Because of the high system load and the accumulation of unexecuted softirq at this moment, `local_bh_enable()` in padata takes longer to execute than usual. Subsequently, when accessing `pd->refcnt`, `pd` has already been released by `padata_free_shell()`, resulting in a UAF issue with `pd->refcnt`. The fix is straightforward: add `refcount_dec_and_test` before calling `padata_free_pd` in `padata_free_shell`. Signed-off-by: Wang Jinchao --- kernel/padata.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/padata.c b/kernel/padata.c index 222d60195de6..15dbcf7ce623 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -1107,7 +1107,8 @@ void padata_free_shell(struct padata_shell *ps) mutex_lock(&ps->pinst->lock); list_del(&ps->list); - padata_free_pd(rcu_dereference_protected(ps->pd, 1)); + if (refcount_dec_and_test(&ps->pd->refcnt)) + padata_free_pd(rcu_dereference_protected(ps->pd, 1)); mutex_unlock(&ps->pinst->lock); kfree(ps);