From nobody Thu Dec 18 19:03:16 2025 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 A4982CE79D2 for ; Wed, 20 Sep 2023 12:37:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235939AbjITMhk (ORCPT ); Wed, 20 Sep 2023 08:37:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235977AbjITMhg (ORCPT ); Wed, 20 Sep 2023 08:37:36 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BAA3AD for ; Wed, 20 Sep 2023 05:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695213404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OJRnSvDMQADh3Wr31msjxxHMdDRAXuX2nElLtMGFtqc=; b=MPqOrPinGAIlwW9zbKvBuoiC5cUV1gkN9gmQA/exWlTN3jYn5voTpXGWX50+v3+2UakWPH RAhVQyvCZ70g+yio6sYh/ZF1CKNQYkUX5BZoo6teuHlJD+ANZwJXEI2yGFmWrizNkPLEjX H4MHQGW4rXc6KBMy9JJ/y1Xx1c5FsK0= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-7ALJkzjOOQaSZyuL75OXHQ-1; Wed, 20 Sep 2023 08:36:43 -0400 X-MC-Unique: 7ALJkzjOOQaSZyuL75OXHQ-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-9ade76f4a44so68123466b.0 for ; Wed, 20 Sep 2023 05:36:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213402; x=1695818202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OJRnSvDMQADh3Wr31msjxxHMdDRAXuX2nElLtMGFtqc=; b=eGJEunD4eC44MgMBDdPo9SX3vq60+aio33NM2PcqDKD/Iz6gvVGB3+jbVX/kJOmt1B dDR88DgCLX8lAu/PU3pDPY/p9r0vJ8/fCYgdxSuaKZQ8Mrl3XNymxgxDQWQb9S7vRyrP WOEVLpeLo7RpGtZPciO7EhysSxYe/O/mnkT/7Qz1SiXP3t+nAm7+Ox21EZ9Slvu30ZG6 Wj1S/OCM7v2MS5nHqDr0YnD9QORpJAkP3Q5+pq8hUxanhC5cMTCWlrMCW2FDCujNbhTQ y+RxZ5qUCoriFTJutMKjWre6nHnyvWsGHqzq3fVd+cnNDbrCcyH1llPd92hHoi7eKYV7 CGnw== X-Gm-Message-State: AOJu0Yxnq/lwdfrEBb+ZtaBqdXtxI7JgbnGjWDJYrrTGp2Dtnkn7jwNh DfiRLB9w3jkfqleVVFuzwvPxbDV1cKQE0aqhhViN73mmC0d8w3QoOEsHvb+nG83ANOi1lO/0fiD KwuhwyO9DdwK+/SHuXoSBdegU X-Received: by 2002:a17:906:196:b0:9a5:9f3c:961f with SMTP id 22-20020a170906019600b009a59f3c961fmr1815595ejb.3.1695213401728; Wed, 20 Sep 2023 05:36:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERwQ2SjAJQSsC9ZRe6AiF2nzMLomaRThlvgCuHfKcv/TAIMXpcfLWGpl0wj1aEZwFhaqVjcw== X-Received: by 2002:a17:906:196:b0:9a5:9f3c:961f with SMTP id 22-20020a170906019600b009a59f3c961fmr1815563ejb.3.1695213401348; Wed, 20 Sep 2023 05:36:41 -0700 (PDT) Received: from fedorinator.. ([2a01:599:906:7772:a505:d891:dcff:9565]) by smtp.gmail.com with ESMTPSA id a18-20020a170906191200b0098e42bef736sm9348305eje.176.2023.09.20.05.36.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:36:37 -0700 (PDT) From: Philipp Stanner To: Kees Cook , Andy Shevchenko , Eric Biederman , Christian Brauner , David Disseldorp , Luis Chamberlain , Siddh Raman Pant , Nick Alcock , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Zack Rusin Cc: VMware Graphics Reviewers , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-hardening@vger.kernel.org, Philipp Stanner , David Airlie , Andy Shevchenko Subject: [PATCH v3 1/5] string.h: add array-wrappers for (v)memdup_user() Date: Wed, 20 Sep 2023 14:36:09 +0200 Message-ID: <20230920123612.16914-3-pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920123612.16914-2-pstanner@redhat.com> References: <20230920123612.16914-2-pstanner@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, user array duplications are sometimes done without an overflow check. Sometimes the checks are done manually; sometimes the array size is calculated with array_size() and sometimes by calculating n * size directly in code. Introduce wrappers for arrays for memdup_user() and vmemdup_user() to provide a standardized and safe way for duplicating user arrays. This is both for new code as well as replacing usage of (v)memdup_user() in existing code that uses, e.g., n * size to calculate array sizes. Suggested-by: David Airlie Signed-off-by: Philipp Stanner Reviewed-by: Andy Shevchenko Reviewed-by: Kees Cook Reviewed-by: Zack Rusin --- include/linux/string.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/linux/string.h b/include/linux/string.h index dbfc66400050..debf4ef1098f 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -5,7 +5,9 @@ #include /* for inline */ #include /* for size_t */ #include /* for NULL */ +#include /* for ERR_PTR() */ #include /* for E2BIG */ +#include /* for check_mul_overflow() */ #include #include =20 @@ -14,6 +16,44 @@ extern void *memdup_user(const void __user *, size_t); extern void *vmemdup_user(const void __user *, size_t); extern void *memdup_user_nul(const void __user *, size_t); =20 +/** + * memdup_array_user - duplicate array from user space + * @src: source address in user space + * @n: number of array members to copy + * @size: size of one array member + * + * Return: an ERR_PTR() on failure. Result is physically + * contiguous, to be freed by kfree(). + */ +static inline void *memdup_array_user(const void __user *src, size_t n, si= ze_t size) +{ + size_t nbytes; + + if (check_mul_overflow(n, size, &nbytes)) + return ERR_PTR(-EOVERFLOW); + + return memdup_user(src, nbytes); +} + +/** + * vmemdup_array_user - duplicate array from user space + * @src: source address in user space + * @n: number of array members to copy + * @size: size of one array member + * + * Return: an ERR_PTR() on failure. Result may be not + * physically contiguous. Use kvfree() to free. + */ +static inline void *vmemdup_array_user(const void __user *src, size_t n, s= ize_t size) +{ + size_t nbytes; + + if (check_mul_overflow(n, size, &nbytes)) + return ERR_PTR(-EOVERFLOW); + + return vmemdup_user(src, nbytes); +} + /* * Include machine specific inline routines */ --=20 2.41.0 From nobody Thu Dec 18 19:03:16 2025 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 44CE1CE79D0 for ; Wed, 20 Sep 2023 12:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236016AbjITMhu (ORCPT ); Wed, 20 Sep 2023 08:37:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235994AbjITMhr (ORCPT ); Wed, 20 Sep 2023 08:37:47 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE62B99 for ; Wed, 20 Sep 2023 05:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695213412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=48G0tj5zzQRFiALYPkyRPndfaCR4k/8e83lXW3c50mA=; b=hNGarVuNQTYpHu0dIy6D7DkVZ3BtBsKZP+rAkR2t+qQCK7txZUDtHcgk8ud0h56wRapW4h CIK6IaZzuC73wEPeNG+uvt8cA8vfe+qhMzmmEa7LuhM+YffQrKy1UddzXUtPSiH/7mHNnu J0dZMxRpBAZ/ChyUVBDcj5cp8ugr7Mw= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-436-6trbgUiSNQOB526Ip8sphg-1; Wed, 20 Sep 2023 08:36:50 -0400 X-MC-Unique: 6trbgUiSNQOB526Ip8sphg-1 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9a9cd336c9cso154936466b.1 for ; Wed, 20 Sep 2023 05:36:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213409; x=1695818209; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=48G0tj5zzQRFiALYPkyRPndfaCR4k/8e83lXW3c50mA=; b=uofIbssM0MyI1vTVryopLkvlkj7ynySuqXAki8rAvITsirgxpkfL1HYHx3RfgOe5AZ NGv+Q5A3TIOQoj0uaNphvoadZ2oVF7YcPAv9aO78vezTBVL6SLA30cm2rH9vp0wdwLQS up8T8c1MzcJYGk/CKPVdFGm6DH2GppNjTL8Sky0VUJij/2Z8m8rubgx81xXNElpYVmPC d+x7U8Bdzd0QXEbIsimt0/Uz/8DuQH3gqqBnfrnFg96khaenDjJqmCpjhC6CYrxcFAAr 4JdnEqc+KTITkZvy40yx6tP7pMQjKxSCm8jPr2eLIRqEU2pRFgnNUVBgs0s6q5VHSAbd rvYw== X-Gm-Message-State: AOJu0Yw7lfwCBkd8muEAvCHU2BkP6sTVu6bldlaQYJO5KulWPFmkW0+W B0HrpSPXLFq5hOHvx8xMMfoLg9DuGUJIZhVPKgysWyJMwDyX1V5meX8kzvyNPbV8w0vtXhJtfB2 BD///p3IccCJ6tNI7li+kZNdC X-Received: by 2002:a17:907:9512:b0:9ae:4492:df34 with SMTP id ew18-20020a170907951200b009ae4492df34mr1444624ejc.6.1695213409774; Wed, 20 Sep 2023 05:36:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmJTym5YvZ4MH52qjmmgnlm70HGxEIyE84IZpdWdDkioxeqQ+sBFeg2a5b+qpjuhd9RNuOjA== X-Received: by 2002:a17:907:9512:b0:9ae:4492:df34 with SMTP id ew18-20020a170907951200b009ae4492df34mr1444608ejc.6.1695213409547; Wed, 20 Sep 2023 05:36:49 -0700 (PDT) Received: from fedorinator.. ([2a01:599:906:7772:a505:d891:dcff:9565]) by smtp.gmail.com with ESMTPSA id u17-20020a1709064ad100b0098ce63e36e9sm9447247ejt.16.2023.09.20.05.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:36:47 -0700 (PDT) From: Philipp Stanner To: Kees Cook , Andy Shevchenko , Eric Biederman , Christian Brauner , David Disseldorp , Luis Chamberlain , Siddh Raman Pant , Nick Alcock , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Zack Rusin Cc: VMware Graphics Reviewers , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-hardening@vger.kernel.org, Philipp Stanner , David Airlie , Baoquan He Subject: [PATCH v3 2/5] kernel: kexec: copy user-array safely Date: Wed, 20 Sep 2023 14:36:10 +0200 Message-ID: <20230920123612.16914-4-pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920123612.16914-2-pstanner@redhat.com> References: <20230920123612.16914-2-pstanner@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, there is no overflow-check with memdup_user(). Use the new function memdup_array_user() instead of memdup_user() for duplicating the user-space array safely. Suggested-by: David Airlie Signed-off-by: Philipp Stanner Acked-by: Baoquan He Reviewed-by: Kees Cook Reviewed-by: Zack Rusin --- kernel/kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 107f355eac10..8f35a5a42af8 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -247,7 +247,7 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsig= ned long, nr_segments, ((flags & KEXEC_ARCH_MASK) !=3D KEXEC_ARCH_DEFAULT)) return -EINVAL; =20 - ksegments =3D memdup_user(segments, nr_segments * sizeof(ksegments[0])); + ksegments =3D memdup_array_user(segments, nr_segments, sizeof(ksegments[0= ])); if (IS_ERR(ksegments)) return PTR_ERR(ksegments); =20 --=20 2.41.0 From nobody Thu Dec 18 19:03:16 2025 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 36927CE79D1 for ; Wed, 20 Sep 2023 12:37:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236036AbjITMh7 (ORCPT ); Wed, 20 Sep 2023 08:37:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236034AbjITMhz (ORCPT ); Wed, 20 Sep 2023 08:37:55 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A44283 for ; Wed, 20 Sep 2023 05:37:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695213421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CkUiTYo02brbH9rdldgLT7YiM95DCTjC6m+zHLs+f1Y=; b=NQ6WtxB5bLM6In9RF2xe4/ErjZ2CauEawMTpsDtqT1BSO0DF/5VG6J8RjC2aR0Eye+R8Jc bmO4h1CcY1G1s2bbKD2DjqppAGDeydxUu3UcfhnNiTde5lEGaXNi6qjqrJJiPTl0pupaoy Dtek3ZX3492u1vAJtBpallfDvzaEViU= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-531-Of_b6cLRNj-ZPLm5ZtSWDQ-1; Wed, 20 Sep 2023 08:37:00 -0400 X-MC-Unique: Of_b6cLRNj-ZPLm5ZtSWDQ-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2be48142a6cso15826121fa.1 for ; Wed, 20 Sep 2023 05:36:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213418; x=1695818218; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CkUiTYo02brbH9rdldgLT7YiM95DCTjC6m+zHLs+f1Y=; b=jE8N/EVWEB1ptVdFEJHg+zGm6nI9v2skLtZal3R1DLgx+f4kHm4iPmeYOqfXGikkep S80PxRgXnm2CW5fry3YqsXh5W76pObbVBhbNQZSUz1nU8odAiQy82a9L/QRi/cC6FxmW 8k5i/2CXtcOH4vZLgeQod+Lkacyuq4jFWkK6BXoJypYNXIvupQfBZP4CNhecZiu9hxbI bU+nLWgqPqykAxl+ZIHMh82yOCiL3glq8+5RRkK4xDL5siteohMtF3Ww254w54Sf7CLl ZVfXFO3iXahNSA2KV+WxKlYvqyk+MFHjYCE62Kr+2/lZByQtFO5ANoiTh5rIeIiynzRH CKUQ== X-Gm-Message-State: AOJu0YypG120nkKftsyO63fV8euV+ui75D7HXt+6V2lli67M7gnYcwz+ gzMtVROfOdoriW2AV9ZVBCwnYjCcmoScHsmblDrhOWx4fxYeCliI5opNl66Wewxg5LKfuWj56eQ wqpgHSqkiN6+z3AEwJUxgpPsH X-Received: by 2002:a05:651c:1693:b0:2c0:196c:e38f with SMTP id bd19-20020a05651c169300b002c0196ce38fmr1921134ljb.1.1695213418530; Wed, 20 Sep 2023 05:36:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGtYN79a4/Uyeq8meM3+9mCAQ2LGvBXOKnKduArpSa1zP3qsVYH9Wh1PFHrd4S88GImDITZQ== X-Received: by 2002:a05:651c:1693:b0:2c0:196c:e38f with SMTP id bd19-20020a05651c169300b002c0196ce38fmr1921120ljb.1.1695213418185; Wed, 20 Sep 2023 05:36:58 -0700 (PDT) Received: from fedorinator.. ([2a01:599:906:7772:a505:d891:dcff:9565]) by smtp.gmail.com with ESMTPSA id op15-20020a170906bcef00b009ae4ead6c01sm660073ejb.163.2023.09.20.05.36.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:36:55 -0700 (PDT) From: Philipp Stanner To: Kees Cook , Andy Shevchenko , Eric Biederman , Christian Brauner , David Disseldorp , Luis Chamberlain , Siddh Raman Pant , Nick Alcock , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Zack Rusin Cc: VMware Graphics Reviewers , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-hardening@vger.kernel.org, Philipp Stanner , David Airlie Subject: [PATCH v3 3/5] kernel: watch_queue: copy user-array safely Date: Wed, 20 Sep 2023 14:36:11 +0200 Message-ID: <20230920123612.16914-5-pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920123612.16914-2-pstanner@redhat.com> References: <20230920123612.16914-2-pstanner@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, there is no overflow-check with memdup_user(). Use the new function memdup_array_user() instead of memdup_user() for duplicating the user-space array safely. Suggested-by: David Airlie Signed-off-by: Philipp Stanner Reviewed-by: Kees Cook Reviewed-by: Zack Rusin --- kernel/watch_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c index d0b6b390ee42..778b4056700f 100644 --- a/kernel/watch_queue.c +++ b/kernel/watch_queue.c @@ -331,7 +331,7 @@ long watch_queue_set_filter(struct pipe_inode_info *pip= e, filter.__reserved !=3D 0) return -EINVAL; =20 - tf =3D memdup_user(_filter->filters, filter.nr_filters * sizeof(*tf)); + tf =3D memdup_array_user(_filter->filters, filter.nr_filters, sizeof(*tf)= ); if (IS_ERR(tf)) return PTR_ERR(tf); =20 --=20 2.41.0 From nobody Thu Dec 18 19:03:16 2025 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 E1550CE79D1 for ; Wed, 20 Sep 2023 12:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236076AbjITMiM (ORCPT ); Wed, 20 Sep 2023 08:38:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236049AbjITMiF (ORCPT ); Wed, 20 Sep 2023 08:38:05 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA7CD8F for ; Wed, 20 Sep 2023 05:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695213432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7KRPqkETTBVBC/zv1aXEUiiiXJ1Cft936yka0iGNazc=; b=NsQNVBVvn8cHPjczHEd+ce2WPl1ngK2pnhiyVc5PtQmWoQ8d+Py5Z8jmz44+yOYavYNmvm GWyQO5jYZh4eydeAyxzk8JDq0QT5L4jsUe495Rdh4Q4RvcX9PvlHJTQMnRNrKQOs76hVvA 3NXHExGLPza5WyCqKStB0fDDqnXyRbM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-638-4e45YJ1yNf2nIe3wTP_STg-1; Wed, 20 Sep 2023 08:37:10 -0400 X-MC-Unique: 4e45YJ1yNf2nIe3wTP_STg-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-404fc59b8acso13443825e9.0 for ; Wed, 20 Sep 2023 05:37:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213429; x=1695818229; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7KRPqkETTBVBC/zv1aXEUiiiXJ1Cft936yka0iGNazc=; b=lVMTfTHCdqXVUxa/8BdisZ3vrnHMjeJe31bjz85LUpA6zZPXvzYVpay6b9EWKf1bCP aAlgT6FQUmkeJxKvQd/td/c8KK9EALcy/7Xjr5nvf78DfevPQWljROmiz9PEtWbMJ+JQ aRGXUoD5KTQpBFxFkE6foRv5w4UmVLsBT4Ww8ZgkxrF58AqMthqC4egIw4DhmFHGd67y 8jz933qFEwccVk2M+gZmgFZIgla+KU4uVKPO+hGHHHxXp6lWd1XJr8OotPSLLg87JdB2 rW1akAabgynh+AT0mJg8mxLPqJxo3RUyRUGF3482MhHAegpZl4sarfVSVgLlDCGjWq3z Nawg== X-Gm-Message-State: AOJu0YxIf/THX7695kz5EcI/pHzK6QXppN5rprGiotD8b1U6ITKS7Ozs wNeDX2DkAGkIAo0a7Os6leL95bxo3WOWobGWqxvf3XBmmIjOLokxrAxwWoKtTlIk/g3XrL6uYW3 uJrhRHjHo4gRQhc/q3oa7+lsf X-Received: by 2002:adf:ec48:0:b0:317:630d:1e8e with SMTP id w8-20020adfec48000000b00317630d1e8emr2031480wrn.2.1695213429376; Wed, 20 Sep 2023 05:37:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGorWXFxi2CZ+i0Bq4z7I+sy7K13wS44rMjIuskory3+gtAyjUda2GeiUfH2k5vq773C10/rA== X-Received: by 2002:adf:ec48:0:b0:317:630d:1e8e with SMTP id w8-20020adfec48000000b00317630d1e8emr2031462wrn.2.1695213429120; Wed, 20 Sep 2023 05:37:09 -0700 (PDT) Received: from fedorinator.. ([2a01:599:906:7772:a505:d891:dcff:9565]) by smtp.gmail.com with ESMTPSA id lg13-20020a170906f88d00b009ad88839665sm9297787ejb.70.2023.09.20.05.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:37:03 -0700 (PDT) From: Philipp Stanner To: Kees Cook , Andy Shevchenko , Eric Biederman , Christian Brauner , David Disseldorp , Luis Chamberlain , Siddh Raman Pant , Nick Alcock , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Zack Rusin Cc: VMware Graphics Reviewers , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-hardening@vger.kernel.org, Philipp Stanner , David Airlie Subject: [PATCH v3 4/5] drm_lease.c: copy user-array safely Date: Wed, 20 Sep 2023 14:36:12 +0200 Message-ID: <20230920123612.16914-6-pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920123612.16914-2-pstanner@redhat.com> References: <20230920123612.16914-2-pstanner@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, there is no overflow-check with memdup_user(). Use the new function memdup_array_user() instead of memdup_user() for duplicating the user-space array safely. Suggested-by: David Airlie Signed-off-by: Philipp Stanner Reviewed-by: Kees Cook Reviewed-by: Zack Rusin --- drivers/gpu/drm/drm_lease.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index 150fe1555068..94375c6a5425 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -510,8 +510,8 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, /* Handle leased objects, if any */ idr_init(&leases); if (object_count !=3D 0) { - object_ids =3D memdup_user(u64_to_user_ptr(cl->object_ids), - array_size(object_count, sizeof(__u32))); + object_ids =3D memdup_array_user(u64_to_user_ptr(cl->object_ids), + object_count, sizeof(__u32)); if (IS_ERR(object_ids)) { ret =3D PTR_ERR(object_ids); idr_destroy(&leases); --=20 2.41.0 From nobody Thu Dec 18 19:03:16 2025 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 5D196CE79CF for ; Wed, 20 Sep 2023 12:38:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236014AbjITMiW (ORCPT ); Wed, 20 Sep 2023 08:38:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236064AbjITMiU (ORCPT ); Wed, 20 Sep 2023 08:38:20 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90AACDD for ; Wed, 20 Sep 2023 05:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695213446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/re3vPWoYJ/6xHLpunyVTZgfJ3oWhQoot3M15Xf93m8=; b=fun9RKCVYIFO2NpscfgqRbewk7rWIr4IcMr0+xs1le64fQaaoai57DN0QqxYOjR07SuBy8 4Gi0Z3qSX7cF4BEqgTSbTXauwOc/zwltUc7VE2Ij+9JUu8HfOSZJbnYdbIMsAKsuicGX3A CNDyu86JF11RjZ76wAFybIhjKgXFhcg= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-537-ZPzisAiJNOi39mfhGckCng-1; Wed, 20 Sep 2023 08:37:25 -0400 X-MC-Unique: ZPzisAiJNOi39mfhGckCng-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9a9cd336c9cso154954366b.1 for ; Wed, 20 Sep 2023 05:37:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695213444; x=1695818244; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/re3vPWoYJ/6xHLpunyVTZgfJ3oWhQoot3M15Xf93m8=; b=lxqmH0dmAsRYOWZ0uzYC0hZPVehCe0w6tfWGfRHZSaF1QpLcnyx4Giku3NoFhNo5gR 6Ys3qe8JuPLTLYfqOzl8RdRNHkq/IOWDQ+9tKyX6JGS2nWMixjc2H0rucHleSwpbUX67 9Fi1exFeM2aCSNbifjKP4XONQLvPYhPT0Euh6ua/GaePXFZRpO6uG3/JPNMS1vwr9rRM ctmk4uFrhmP5WkoF8CHvArzKky8XnrjIKrOCqp5MJUSKGVEebQjMHeDApY1OidqTvRDV CStik6QwVdIOYkZIcvhnJ4hlRJ35a9wD1CbuOPiZNUcDivy8Jft8YTAW2UsyzxaBbdHW ErMA== X-Gm-Message-State: AOJu0YxAJswF1tek89Yuj6woZbSzo7TXY6yOnP5x5i9yexG08KQ03nrq IJ16jIvvBY7twiq/R4liixEdQtqhsYrmDCeBCI/szRU6WbK5rjosypSHhaLJp7Srkni9OqsS9BE ODj3TWdDzchHp6D4JiXLsn3MQ X-Received: by 2002:a17:906:1d4:b0:9ad:f4d9:f6f2 with SMTP id 20-20020a17090601d400b009adf4d9f6f2mr1978098ejj.5.1695213444578; Wed, 20 Sep 2023 05:37:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhjndQs4UNSwfullLxNR+tIZdKn1iy3aRr+eKNx4dO54tFLsdtNfZQxNfsH7DoGs3jy6KzlA== X-Received: by 2002:a17:906:1d4:b0:9ad:f4d9:f6f2 with SMTP id 20-20020a17090601d400b009adf4d9f6f2mr1978090ejj.5.1695213444350; Wed, 20 Sep 2023 05:37:24 -0700 (PDT) Received: from fedorinator.. ([2a01:599:906:7772:a505:d891:dcff:9565]) by smtp.gmail.com with ESMTPSA id h11-20020a170906854b00b0099ccee57ac2sm9233184ejy.194.2023.09.20.05.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 05:37:19 -0700 (PDT) From: Philipp Stanner To: Kees Cook , Andy Shevchenko , Eric Biederman , Christian Brauner , David Disseldorp , Luis Chamberlain , Siddh Raman Pant , Nick Alcock , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Zack Rusin Cc: VMware Graphics Reviewers , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, linux-hardening@vger.kernel.org, Philipp Stanner , David Airlie Subject: [PATCH v3 5/5] drm: vmgfx_surface.c: copy user-array safely Date: Wed, 20 Sep 2023 14:36:13 +0200 Message-ID: <20230920123612.16914-7-pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230920123612.16914-2-pstanner@redhat.com> References: <20230920123612.16914-2-pstanner@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, there is no overflow-check with memdup_user(). Use the new function memdup_array_user() instead of memdup_user() for duplicating the user-space array safely. Suggested-by: David Airlie Signed-off-by: Philipp Stanner Reviewed-by: Kees Cook Reviewed-by: Zack Rusin --- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwg= fx/vmwgfx_surface.c index 5db403ee8261..9be185b094cb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -777,9 +777,9 @@ int vmw_surface_define_ioctl(struct drm_device *dev, vo= id *data, sizeof(metadata->mip_levels)); metadata->num_sizes =3D num_sizes; metadata->sizes =3D - memdup_user((struct drm_vmw_size __user *)(unsigned long) + memdup_array_user((struct drm_vmw_size __user *)(unsigned long) req->size_addr, - sizeof(*metadata->sizes) * metadata->num_sizes); + metadata->num_sizes, sizeof(*metadata->sizes)); if (IS_ERR(metadata->sizes)) { ret =3D PTR_ERR(metadata->sizes); goto out_no_sizes; --=20 2.41.0