From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A30A6C3F6B0 for ; Mon, 22 Aug 2022 13:32:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233537AbiHVNcW (ORCPT ); Mon, 22 Aug 2022 09:32:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235073AbiHVNcV (ORCPT ); Mon, 22 Aug 2022 09:32:21 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9C6D2CDE1 for ; Mon, 22 Aug 2022 06:32:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A3D94B81218 for ; Mon, 22 Aug 2022 13:32:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0877C433D6; Mon, 22 Aug 2022 13:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661175138; bh=wgv5ed8ab2v5+S1eqEcQ4SsjjkPGcuh788lZSodVBhc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=K5klZ2SKBXMPWHWEEpM+NSyT06ddLa+IzDsB2LWTm2LNHCn5rpmdLBMk2uCf6piga TbjZ61SUFMvurv2oFE66M74Gq41hvseId92MsUdmTGk3TZ39pG9Ylno5TWFy9LvpM3 VwKh5b2G0fO/HGYhWdok1fgoX/uqI+OJoYF7JStc= Date: Mon, 22 Aug 2022 15:32:15 +0200 From: Greg KH To: Jens Wiklander Cc: stable@vger.kernel.org, Sumit Garg , Jerome Forissier , Nimish Mishra , Anirban Chakraborty , Debdeep Mukhopadhyay , Linus Torvalds Subject: Re: [PATCH] tee: add overflow check in tee_ioctl_shm_register() Message-ID: References: <20220822131227.3865684-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220822131227.3865684-1-jens.wiklander@linaro.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Aug 22, 2022 at 03:12:27PM +0200, Jens Wiklander wrote: > commit 573ae4f13f630d6660008f1974c0a8a29c30e18a upstream. > > With special lengths supplied by user space, tee_shm_register() has > an integer overflow when calculating the number of pages covered by a > supplied user space memory region. > > This may cause pin_user_pages_fast() to do a NULL pointer dereference. > > Fix this by adding an an explicit call to access_ok() in > tee_ioctl_shm_register() to catch an invalid user space address early. > > Fixes: 033ddf12bcf5 ("tee: add register user memory") > Cc: stable@vger.kernel.org # 5.4 > Cc: stable@vger.kernel.org # 5.10 > Reported-by: Nimish Mishra > Reported-by: Anirban Chakraborty > Reported-by: Debdeep Mukhopadhyay > Suggested-by: Jerome Forissier > Signed-off-by: Linus Torvalds > [JW: backport to stable 5.4 and 5.10 + update commit message] You already sent me a 5.4 version here: https://lore.kernel.org/r/20220822092621.3691771-1-jens.wiklander@linaro.org And I applied that. And for 5.10, it's already in the tree as commit 578c349570d2 ("tee: add overflow check in register_shm_helper()") and was in the 5.10.137 release. > Signed-off-by: Jens Wiklander > --- > drivers/tee/tee_core.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c > index a7ccd4d2bd10..2db144d2d26f 100644 > --- a/drivers/tee/tee_core.c > +++ b/drivers/tee/tee_core.c > @@ -182,6 +182,9 @@ tee_ioctl_shm_register(struct tee_context *ctx, > if (data.flags) > return -EINVAL; > > + if (!access_ok((void __user *)(unsigned long)data.addr, data.length)) > + return -EFAULT; What I took in 5.10.137 was: + if (!access_ok((void __user *)addr, length)) + return ERR_PTR(-EFAULT); Should I fix it up to look like what you sent here instead? confused, greg k-h