From patchwork Thu Oct 27 04:04:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 11540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp19717wru; Wed, 26 Oct 2022 21:17:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6hGl6Bf1cjp7AY/80pGCsva6aCJjT/OviY82YK+uhJKbMSVxBoBtCoIVy1jA0+P/mWvx1M X-Received: by 2002:a17:907:2e0d:b0:78e:314:9d88 with SMTP id ig13-20020a1709072e0d00b0078e03149d88mr40918385ejc.54.1666844262228; Wed, 26 Oct 2022 21:17:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666844262; cv=none; d=google.com; s=arc-20160816; b=TyNeIhM754ElFDARmRczF3Z/jE+pqyldEa/ersOSLGIfm4TCSjXo0G4nogJBWH8oio ylLV2pCmw/HZApwQeAlsck/ALqSs5nH9YkcGXkCKaCfD8DA0U5SSKzRYRZRfJyv6lBsR ENwKIe2zOCp/6G7LuKfl8JOnfLPi0TBEebZY6mXFFvDiyGi1ZTDcAw0f4zQabSIloKSV /DmVGpTv7SkZ5P9LfvIKc9CTnFaRujuiUnyVNX7gSJNC4kqSZt2LIrBdsyCH8IczVNl5 erWmJsfxGKHoJhrAvCQ1iEnSedI9fMX65jFuyM/S3ad3Z9DvUjzV1y6CfZiRCcOqCBy2 M7IQ== 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=hToTL1YXyd99vlYdAIvfJ1lzlYkibJvP8auH8qTvXJM=; b=T1uiMYL8/IRrZgXkybm3XxEzzdUQiHdU/Bqm1eeStXd8yMUwGnqFST8wf3K0i6oC3i Dktlyov4yq4ee/GSoeuH4foKMMiU/qGPCGqXZGzHmX0meHAYglluY2G2X9vn4+Aodl/c Kx0YgrlBH36J7Fb6tl5B1ZpwCEGpHpn+TbZQjW5FSWxKzPfF0MQkDGBhtU72TTEQzkKl O/XRqEbUM8iaw9JpVKlpED/u0SnlqTzKz8VrOhk1f7M6wqcJC54AZf57/4SIWQOQLjCA cYF5ISkobxKP3biN4SfH+1Z4fG7wdMYuIxdCSjHb4OuX4USUGIuOhLiRcVnrMOVo0ZCU FJew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="Mld/Ujl6"; 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 c16-20020a05640227d000b00457fc1bcf12si596490ede.183.2022.10.26.21.17.16; Wed, 26 Oct 2022 21:17:42 -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="Mld/Ujl6"; 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 S233916AbiJ0EFi (ORCPT + 99 others); Thu, 27 Oct 2022 00:05:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232906AbiJ0EFe (ORCPT ); Thu, 27 Oct 2022 00:05:34 -0400 Received: from mail-m972.mail.163.com (mail-m972.mail.163.com [123.126.97.2]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9D2976175A for ; Wed, 26 Oct 2022 21:05:31 -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=hToTL 1YXyd99vlYdAIvfJ1lzlYkibJvP8auH8qTvXJM=; b=Mld/Ujl6JPVy2/Lr7AsEe zz3Wn2X987bsXRgBjDzXhzZlr1zlDAZeZhbiwuyn31DzYfji/ItfEQxRoZwzsHF0 7r5kCrV9KEzUwjf8gganbYNx6kUALZChCKv1TCSDJvHUGX92I6v31kHtEtYrVPPv FA6QRlSVzpGM6nv9k/AjW8= Received: from localhost.localdomain (unknown [111.206.145.21]) by smtp2 (Coremail) with SMTP id GtxpCgBHuM1vA1pjIBc6pA--.31475S2; Thu, 27 Oct 2022 12:05:04 +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, sivanich@hpe.com, Zheng Wang Subject: [PATCH v5] misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os Date: Thu, 27 Oct 2022 12:04:55 +0800 Message-Id: <20221027040455.115035-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: GtxpCgBHuM1vA1pjIBc6pA--.31475S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGr4xtF4UKFy3AryxAw4fZrb_yoWrKr43pa 1jg348urW3XF4Y9rs7ta1kXFW3Ca48JFW5Gr9rJ34F9w4rAFs8C34DJas0qr4DZrW0qF4a yr4rtFnI93Z0gaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zi-J55UUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/xtbCqRSnU10DhX4-bgAAs9 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?1747812889268508015?= X-GMAIL-MSGID: =?utf-8?q?1747812889268508015?= 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 --- v5: - fix logical issue and remove unnecessary variable suggested by Dimitri Sivanich 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 | 17 +++++++++++++---- drivers/misc/sgi-gru/grutables.h | 2 +- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index d7ef61e602ed..bdd515d33225 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,11 @@ 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); + if (gru_check_context_placement(gts)) { + gru_unlock_gts(gts); + gru_unload_context(gts, 1); + return -EINVAL; + } } break; case sco_gseg_owner: diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c index 9afda47efbf2..8c9f7055068d 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,12 @@ vm_fault_t gru_fault(struct vm_fault *vmf) mutex_lock(>s->ts_ctxlock); preempt_disable(); - gru_check_context_placement(gts); + if (gru_check_context_placement(gts)) { + 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);