From patchwork Wed Nov 9 09:33:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 17428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp241353wru; Wed, 9 Nov 2022 01:44:41 -0800 (PST) X-Google-Smtp-Source: AMsMyM7kSOQB3L3ZBTJPT3lchCVEpMKbMN2NKm8uCuiiPn/m04tzEWAPNIIQfMrMrLhV/1Ne15Ph X-Received: by 2002:a17:907:744:b0:741:36b9:d2cc with SMTP id xc4-20020a170907074400b0074136b9d2ccmr54426381ejb.613.1667987080994; Wed, 09 Nov 2022 01:44:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667987080; cv=none; d=google.com; s=arc-20160816; b=fqEXnM4SUWUSVHknM6D3cHtOfUWEbL17Pag+O9sr3l6XUbVHA4ByrSjyL2F/kgGJWC xQLYvbpJvNFco5cEXaLoGaYRui2N2wSuSjFViW/IHWbxRnt+9RgNGq4lsvQI2DsZWiQ/ fv6j2OMEGZhk0Qb/Uxc02XB+nu3QdG2ng75i+dHJ+d4RVkr3RuqONo2hFwFRgyGtacle EOSMdpT2T9d2mgboB31PNVYOBxyT8KMzcrbBw08ML1vnLlx8Cz5izOOggWHIN7i6svL8 BRqhW08FBhSenyecSE3uAa07EmI1LBufCqAPDnphq8Mxa9b20NiMiGzi0XiGSqj9nHVx ZqSA== 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=9lxWEMuliLRNKOwma+a4Lvb7lCkvcQgNph0GNJHVx+s=; b=X8aZbqWboY0wsVLKzsV8y/th3+YvJtacZt6QUwTxN8ZxtMr5wEyOnCCm8pBp+FHZXC rCh6hVXyDQqSYLu6dpurTyFR5L5nzsCckWKOjAnLn3Qa7oJd4lzzp/zEJYxr3qPS5Dij wBfYotw3l9pZ73Sdg638BZUloyKNPq5F39pSJUbIwnioCNRbvFLNFwcKCFs63F9O6ecI UO62uZZ/fI4abKAfdToHf/4Ca84KwM/BGL592VA+c2s8Lkw8rHIaafuggXZ68zvI+kMB qy5eU3vnGvQHMxdtVIGmVBWuFTvjTf96RxTMyEOO7MLv2oM2NONEqJcxQH2slO9jR2qp UcAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="Iq01/Td0"; 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 sa26-20020a1709076d1a00b007ad945aa04asi16270783ejc.678.2022.11.09.01.44.09; Wed, 09 Nov 2022 01:44:40 -0800 (PST) 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="Iq01/Td0"; 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 S229992AbiKIJe2 (ORCPT + 99 others); Wed, 9 Nov 2022 04:34:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbiKIJeZ (ORCPT ); Wed, 9 Nov 2022 04:34:25 -0500 Received: from mail-m972.mail.163.com (mail-m972.mail.163.com [123.126.97.2]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E4A6695B5 for ; Wed, 9 Nov 2022 01:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=9lxWE MuliLRNKOwma+a4Lvb7lCkvcQgNph0GNJHVx+s=; b=Iq01/Td0oQscnGpU/ysFU plqtoDlLXKdPArrLC/0z3vSBBw3qOdaB4y8InXaxE7Sq9aRfBI14r2QXz183LJ6J FoAqLYCcZzvfDX43hFHuw6fUHCsYCcLHaXJOglMcMOOHJ5chRbeVdcP9g2wHGs1D 3xju4XMd74CHlRpPelkVrY= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by smtp2 (Coremail) with SMTP id GtxpCgAn1+r7c2tjhcSDrw--.48340S2; Wed, 09 Nov 2022 17:33:48 +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, lkp@intel.com, Zheng Wang Subject: [PATCH v7] misc: sgi-gru: fix use-after-free error in gru_set_context_option, gru_fault and gru_handle_user_call_os Date: Wed, 9 Nov 2022 17:33:47 +0800 Message-Id: <20221109093347.228761-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: GtxpCgAn1+r7c2tjhcSDrw--.48340S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGr4xtF4UKF4rXFyfAF4rAFb_yoWrtw4rpa 1jg3409rW3JF4a9F47ta1kXFW3Ca48JFW5Gr9rt34ruw4rAF45GryDtas0qr4DurW0qa1a yr4rtF9I93Z0ga7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziWCJPUUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiXBy0U1Xl4vID2AAAsc 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?1749011221665421159?= X-GMAIL-MSGID: =?utf-8?q?1749011221665421159?= 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") Signed-off-by: Zheng Wang Acked-by: Dimitri Sivanich Tested-by: kernel test robot --- v7: - fix some spelling problems suggested by Greg, change kernel test robot from reported-by tag to tested-by tag v6: - remove unused var checked by kernel test robot 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 | 16 ++++++++++++---- drivers/misc/sgi-gru/grutables.h | 2 +- 3 files changed, 25 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..beba69fc3cd7 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; } @@ -934,7 +937,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);