From patchwork Wed Nov 9 08:41:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Wang X-Patchwork-Id: 17409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp223858wru; Wed, 9 Nov 2022 00:54:47 -0800 (PST) X-Google-Smtp-Source: AMsMyM4kjpcv3V3Gr1aAGgN1FBGrHzzxh8os1MZX3bf9cSyDBDpgUlYGqqIwsITYZrSzASWwX17N X-Received: by 2002:a05:6a00:e83:b0:56b:e975:cf98 with SMTP id bo3-20020a056a000e8300b0056be975cf98mr1167457pfb.63.1667984086794; Wed, 09 Nov 2022 00:54:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667984086; cv=none; d=google.com; s=arc-20160816; b=rMc4Gu5gzBHdqNn+JocwkrrHFFCaozff+xjjOgC/px9pG+2nIDW3fFX6bky9vOcIGT zgBLIDLRTc/1v+YUetUd+AeMwaFEA1hDhlx1/CX1ad/4S9uAwuWYRwqbSK0W8hF+Pyi5 wRQ4MQRrWWs3n3EGeKlJADcuUCscNQbGJg1sI21/UQcJ5SGrJApTrPllYtJMSNccuAVj lKxfMkUfQd58QC1jugcq8WIPU3IIm4Hr8qsxS8xfzkZaKmtYFuHK/CzO5Umq0COqLiRa iHFdPGZ/QChORGYZksk4ItD1cbfPRDMcOUR2g59/XPATE8TDttRoBCxsNSustSpw+ybI ur8Q== 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=LMER/XN9djBC7ZzxLygpTeXj9Jg1JgKK8qqQA21yk+w=; b=YjDfr9xcXqoFo6HtlvJHOtoZ0mURUYAWpGhVAnO1WM8AAjFOxeNiHkknDYfD1d/ZZM 1OfaUkoSTNwSU/3a/3kDq70Ah/Yf1VcZGDY0iRjsSTAqF1ReUttJ22kTquh4CZuhBJcR +5OvOq25hQ4RQe9dCQgTWwfsXN3KL7izd7EUuvZd6jWajLHMWhNZD/6v0eILutDGAD3j LoNsOku+jdwQHI5HZmb9GEd9wxmbrTbsusVv9nV6kzni8xCH6QPhi2CBJopVqo4mUPpZ REMp8TRzxQ5jL4MChPvv9h3fteKtBFMnOR1nTKXaTjI94iPX5hbYvG07Xx0cYT0pDaUg lJQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=duJlt1bd; 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 g24-20020a633758000000b00438854c876esi17699786pgn.419.2022.11.09.00.54.33; Wed, 09 Nov 2022 00:54:46 -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=duJlt1bd; 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 S230029AbiKIImt (ORCPT + 99 others); Wed, 9 Nov 2022 03:42:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229492AbiKIImt (ORCPT ); Wed, 9 Nov 2022 03:42:49 -0500 Received: from mail-m974.mail.163.com (mail-m974.mail.163.com [123.126.97.4]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0D83A17E0D for ; Wed, 9 Nov 2022 00:42:46 -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=LMER/ XN9djBC7ZzxLygpTeXj9Jg1JgKK8qqQA21yk+w=; b=duJlt1bdgZ3F9xn53vzyp IpUxfDmXJXzPDxZFCd0oLh8JYqW9ZGb1VWUGmxdeo7yskOHOrPyz7+UsYwefFsu6 um/PrQcuBbeuJNu8uprCF7uwrsOLSWP3+REj7ClTpPvJADQDeoVaN1A5aTp1kZlG 0ci4ShszM31IEDzHeCgF08= Received: from leanderwang-LC2.localdomain (unknown [111.206.145.21]) by smtp4 (Coremail) with SMTP id HNxpCgBXNfnGZ2tjm+4IrQ--.50247S2; Wed, 09 Nov 2022 16:41:43 +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 v6 RESEND] 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 16:41:42 +0800 Message-Id: <20221109084142.226960-1-zyytlz.wz@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CM-TRANSID: HNxpCgBXNfnGZ2tjm+4IrQ--.50247S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxGr4xtF4UKF43Gr4kCw1UGFg_yoWrtF13pa 1jg348urW3JF4Y9F47ta1kXFW3Ca4kJFW5Gr9rt34ruw4rAFs8GryDtas0qr4DurW0qa1a yr4rtFnI93Z0ga7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0ziWv38UUUUU= X-Originating-IP: [111.206.145.21] X-CM-SenderInfo: h2113zf2oz6qqrwthudrp/1tbiGge0U1aEDYX12wAAsO 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?1749008081679158742?= X-GMAIL-MSGID: =?utf-8?q?1749008081679158742?= 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 Reported-by: kernel test robot Signed-off-by: Zheng Wang Acked-by: Dimitri Sivanich --- 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);