From patchwork Wed Oct 19 03:14:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 4427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp105919wrs; Tue, 18 Oct 2022 20:25:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7C5Q7AyS2axEZ5wLsDblD1Cs+5Gaeks7iYdm/m0qMgT1GoRmxLNX4TkbIVfAPkZ7Dc1dAi X-Received: by 2002:a17:907:9602:b0:780:8c9f:f99a with SMTP id gb2-20020a170907960200b007808c9ff99amr4973686ejc.465.1666149904014; Tue, 18 Oct 2022 20:25:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666149904; cv=none; d=google.com; s=arc-20160816; b=e8LVq1n/h++GQap4dpWkCeCOgbYeamSw2P58HP78lKDqzMrNfb+WrR5ESfSLnObx36 E+k7ZYzclrGu0tkVobfyq4KyUZCCGsNQAdBNFPnZsXtVWR/eUjrqyaVs6hoShHcCla0G N9lY25mLKII+Q6AFpIwmkfwhmPwqwaddPdA8DJnJGOo4bGAo19lxkSGhZOOMP22Fjrks m1CHTXSSRfNrcXWwY32wzi6o3vxR0LBNk8Ppj2019a6drS37tHlYUD5aw55iL3LWYcOS OhFI72B0mvxvfRrmMOeYA/NmWxBunJCsDfbyljgbxgZnCMEClkxTZIJKV1SRSCtbGRxy BetQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=4ljMN8Acdu32tWrNECoIr2RUoGL9U4V3ODGHPZdQnuk=; b=VeCOnztIfS6o07YmCp2I0x/rkm02DiK5iYDFBFhH1Ml81njY5tLpGFaS9RelZLfIoy tzWCIrHYviu5L1vlWA+UviLS70o3dDqzb0O1wkJ5jSMNQC+DBYVCh9O1BdcRY7XB9fn7 Knoxa/6AsBZIxVn8nfIAXA5FcyQ7H0BToVgZt5OYP4EO0I93jpkyXWGoIf7mJ9/5IDHZ ZQdLjs5Du14QJrTFCU+krBz0xyvrVUK69BEK78lWg8FwRCoVfh9UK6X7ODbrwQF2+yRE LlaTCbFjj7JUc9A6+d+A0n0t/opj73YQSiTHs81c6R/A5NEChSytmQ/n7/q2yHJfxb6Y HHxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="i/7jgS51"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id js7-20020a17090797c700b00790058488d3si10349473ejc.89.2022.10.18.20.24.39; Tue, 18 Oct 2022 20:25:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="i/7jgS51"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229914AbiJSDPS (ORCPT + 99 others); Tue, 18 Oct 2022 23:15:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229975AbiJSDPB (ORCPT ); Tue, 18 Oct 2022 23:15:01 -0400 Received: from mail-m975.mail.163.com (mail-m975.mail.163.com [123.126.97.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D268212751 for ; Tue, 18 Oct 2022 20:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=4ljMN 8Acdu32tWrNECoIr2RUoGL9U4V3ODGHPZdQnuk=; b=i/7jgS51FeKBPZxc0Jn+y 3WGUu2PVDfMNNGCi3qVxuu1ZKqOl/BGlFb/WDaqxxbRk5pUOqQ/RHDzF5WcUcIdZ oXa5eURjhvNawqOEZHv5cznsS1xPSvvspAHMoZYUZvn68gg1BHn+9Z7CQQEclm1N DoIZEU+8eCzBJU/nzujL5g= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by smtp5 (Coremail) with SMTP id HdxpCgBHVAyPa09jNuHElg--.26802S2; Wed, 19 Oct 2022 11:14:24 +0800 (CST) From: Zheng Wang To: gregkh@linuxfoundation.org Cc: zhengyejian1@huawei.com, dimitri.sivanich@hpe.com, arnd@arndb.de, linux-kernel@vger.kernel.org, hackerzheng666@gmail.com, alex000young@gmail.com, security@kernel.org, Zheng Wang Subject: [PATCH v3] misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os Date: Wed, 19 Oct 2022 11:14:23 +0800 Message-Id: <20221019031423.901246-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: HdxpCgBHVAyPa09jNuHElg--.26802S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGr4xtF4UKFy3AryxAw4fZrb_yoWrKF18pa 1jg348ZrW3XF45urs7ta1kWFW3Ca4kJFWUGr9rt34F9w4rAFs8C34DJas0qr4DZrW0qr4a yr4rtFnI9an0g3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziaLv_UUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/xtbB2BOfU2BHMS4LQgAAs2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747045346250486192?= X-GMAIL-MSGID: =?utf-8?q?1747084801724822829?= Gts may be freed in gru_check_chiplet_assignment. The caller still use it after that, UAF happens. Fix it by introducing a return value to see if it's in error path or not. Free the gts in caller if gru_check_chiplet_assignment check failed. Fixes: 55484c45dbec ("gru: allow users to specify gru chiplet 2") Reported-by: Zheng Wang Signed-off-by: Zheng Wang --- v4: - use VM_FAULT_NOPAGE as failure code in gru_fault and -EINVAL in other functions suggested by Yejian v3: - add preempt_enable and use VM_FAULT_NOPAGE as failure code suggested by Yejian v2: - commit message changes suggested by Greg v1: https://lore.kernel.org/lkml/CAJedcCzY72jqgF-pCPtx66vXXwdPn-KMagZnqrxcpWw1NxTLaA@mail.gmail.com/ --- drivers/misc/sgi-gru/grufault.c | 14 ++++++++++++-- drivers/misc/sgi-gru/grumain.c | 18 ++++++++++++++---- drivers/misc/sgi-gru/grutables.h | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index d7ef61e602ed..2b5b049fbd38 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c @@ -656,7 +656,9 @@ int gru_handle_user_call_os(unsigned long cb) if (ucbnum >= gts->ts_cbr_au_count * GRU_CBR_AU_SIZE) goto exit; - gru_check_context_placement(gts); + ret = gru_check_context_placement(gts); + if (ret) + goto err; /* * CCH may contain stale data if ts_force_cch_reload is set. @@ -677,6 +679,10 @@ int gru_handle_user_call_os(unsigned long cb) exit: gru_unlock_gts(gts); return ret; +err: + gru_unlock_gts(gts); + gru_unload_context(gts, 1); + return -EINVAL; } /* @@ -874,7 +880,7 @@ int gru_set_context_option(unsigned long arg) } else { gts->ts_user_blade_id = req.val1; gts->ts_user_chiplet_id = req.val0; - gru_check_context_placement(gts); + ret = gru_check_context_placement(gts); } break; case sco_gseg_owner: @@ -889,6 +895,10 @@ int gru_set_context_option(unsigned long arg) ret = -EINVAL; } gru_unlock_gts(gts); + if (ret) { + gru_unload_context(gts, 1); + ret = -EINVAL; + } return ret; } diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c index 9afda47efbf2..77becb52f550 100644 --- a/drivers/misc/sgi-gru/grumain.c +++ b/drivers/misc/sgi-gru/grumain.c @@ -716,9 +716,10 @@ static int gru_check_chiplet_assignment(struct gru_state *gru, * chiplet. Misassignment can occur if the process migrates to a different * blade or if the user changes the selected blade/chiplet. */ -void gru_check_context_placement(struct gru_thread_state *gts) +int gru_check_context_placement(struct gru_thread_state *gts) { struct gru_state *gru; + int ret = 0; /* * If the current task is the context owner, verify that the @@ -727,14 +728,16 @@ void gru_check_context_placement(struct gru_thread_state *gts) */ gru = gts->ts_gru; if (!gru || gts->ts_tgid_owner != current->tgid) - return; + return ret; if (!gru_check_chiplet_assignment(gru, gts)) { STAT(check_context_unload); - gru_unload_context(gts, 1); + ret = -EINVAL; } else if (gru_retarget_intr(gts)) { STAT(check_context_retarget_intr); } + + return ret; } @@ -919,6 +922,7 @@ vm_fault_t gru_fault(struct vm_fault *vmf) struct gru_thread_state *gts; unsigned long paddr, vaddr; unsigned long expires; + int ret; vaddr = vmf->address; gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n", @@ -934,7 +938,13 @@ vm_fault_t gru_fault(struct vm_fault *vmf) mutex_lock(>s->ts_ctxlock); preempt_disable(); - gru_check_context_placement(gts); + ret = gru_check_context_placement(gts); + if (ret) { + preempt_enable(); + mutex_unlock(>s->ts_ctxlock); + gru_unload_context(gts, 1); + return VM_FAULT_NOPAGE; + } if (!gts->ts_gru) { STAT(load_user_context); diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h index 5efc869fe59a..f4a5a787685f 100644 --- a/drivers/misc/sgi-gru/grutables.h +++ b/drivers/misc/sgi-gru/grutables.h @@ -632,7 +632,7 @@ extern int gru_user_flush_tlb(unsigned long arg); extern int gru_user_unload_context(unsigned long arg); extern int gru_get_exception_detail(unsigned long arg); extern int gru_set_context_option(unsigned long address); -extern void gru_check_context_placement(struct gru_thread_state *gts); +extern int gru_check_context_placement(struct gru_thread_state *gts); extern int gru_cpu_fault_map_id(void); extern struct vm_area_struct *gru_find_vma(unsigned long vaddr); extern void gru_flush_all_tlb(struct gru_state *gru);