From nobody Sat Feb 7 04:20:54 2026 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 7D00CC6FA8F for ; Wed, 30 Aug 2023 18:53:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244777AbjH3SvW (ORCPT ); Wed, 30 Aug 2023 14:51:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244709AbjH3NrU (ORCPT ); Wed, 30 Aug 2023 09:47:20 -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 CE95E12F for ; Wed, 30 Aug 2023 06:46:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693403189; 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=YTYt2BSQEZut8ffX05oFQAoT2Tz1O17bKncsR4XeBIs=; b=X44ubrSmM1rpfeLXq0Y+RPjPBUlu/VHdmKaLrO2s6ZBMvJX5HIQlbcUpz78OsJeysXuFeF unuHQ3N7O0xrMiE2+KmBnwpNritORGA+piM7NtCBp5sgZAbdaVE+wP7STBeOWy2tme1zL4 kmYeUJLNN5ykFDGUk9Gcjq1OZSgkx0o= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-206-xV2FbFoOOL2HsszY-NhH7Q-1; Wed, 30 Aug 2023 09:46:28 -0400 X-MC-Unique: xV2FbFoOOL2HsszY-NhH7Q-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-9a5c5f0364dso53522066b.0 for ; Wed, 30 Aug 2023 06:46:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693403185; x=1694007985; 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=YTYt2BSQEZut8ffX05oFQAoT2Tz1O17bKncsR4XeBIs=; b=kaK9/tdMaDDIN42lMK69os1QSma9Y2NHfTmjVA2XAyHrCnRvRsey+Zv6F9eGLmZpSp nm5J23LVCPd174kBynSk93QQYuMVxBcbeKgHMQU9hb3iOE0MqmZ743gXa+76qx617ysj UbNS5WOur4dMGT/c468OYeGRo12EzkqU/xqaJQ9lbDfLPgvP5HZX+vZLK1+favvVCXZP rZx/JUMwFQmkMLT2bpj988V8dJ2CajlK0wEUrf0aQHXocwFRXWaHN6RF1XAWLpK6hcKp X7QNjzJ9OqvD4g+8CMTLdPJjRj4LM268PPagepPjYnXXUr+y9nx2Rt1ferJPbdcPsRWm aWkQ== X-Gm-Message-State: AOJu0Ywe38dXc08XDTX7rKEH932gBFdYaVJf+ct+0wp0wgFGPD5UbS3u 6b1/6LrxAcohYs95fTtn5cMGqdIFo+e+DD4Ei7dtYb49EXRU1vCFebbaKzKfFChECvwyDAwKnwE 7Q+Z5GeJ8hPub0isuljI9jcsP X-Received: by 2002:a17:906:74cb:b0:9a1:eb67:c0d3 with SMTP id z11-20020a17090674cb00b009a1eb67c0d3mr1497355ejl.4.1693403185528; Wed, 30 Aug 2023 06:46:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFs3XWD3GCd0nxchFLVqW0usUrIz+VOttxkboYOB/XHHWAwTxGY9Rlu6B7+6AhH9DbE4wdw7w== X-Received: by 2002:a17:906:74cb:b0:9a1:eb67:c0d3 with SMTP id z11-20020a17090674cb00b009a1eb67c0d3mr1497324ejl.4.1693403185198; Wed, 30 Aug 2023 06:46:25 -0700 (PDT) Received: from fedorinator.fritz.box ([2001:9e8:32e4:1500:aa40:e745:b6c9:7081]) by smtp.gmail.com with ESMTPSA id t26-20020a1709063e5a00b009829dc0f2a0sm7174419eji.111.2023.08.30.06.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 06:46:24 -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 1/5] string.h: add array-wrappers for (v)memdup_user() Date: Wed, 30 Aug 2023 15:45:52 +0200 Message-ID: <46f667e154393a930a97d2218d8e90286d93a062.1693386602.git.pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 --- include/linux/string.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/linux/string.h b/include/linux/string.h index dbfc66400050..0e8e7a40bae7 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -6,6 +6,8 @@ #include /* for size_t */ #include /* for NULL */ #include /* for E2BIG */ +#include /* for check_mul_overflow() */ +#include /* for ERR_PTR() */ #include #include =20 @@ -14,6 +16,46 @@ 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 (unlikely(check_mul_overflow(n, size, &nbytes))) + return ERR_PTR(-EINVAL); + + 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 (unlikely(check_mul_overflow(n, size, &nbytes))) + return ERR_PTR(-EINVAL); + + return vmemdup_user(src, nbytes); +} + /* * Include machine specific inline routines */ --=20 2.41.0 From nobody Sat Feb 7 04:20:54 2026 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 63FB8C83F1A for ; Wed, 30 Aug 2023 18:53:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243921AbjH3SuV (ORCPT ); Wed, 30 Aug 2023 14:50:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244704AbjH3NrN (ORCPT ); Wed, 30 Aug 2023 09:47:13 -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 3915C107 for ; Wed, 30 Aug 2023 06:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693403191; 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=uG5M2Lwpie6cChdlBf2i1g6i8ozHuD8iPPR+2gMyfYc=; b=g/l+PkCMGx9sWGN5eBN5jsf85xnUUfy66IrogE2JUurfNX5H1PCw4Pkb8dY/SuMPQdfx3y u6i6dnlH1+P0Bv7CSUxPxSSqLiblE4QCq7PjVdWTV8eh9N2vSZ/Kx/dqASPvxDatARsPC/ iCyMh88PSSvBVr77qVs4RyBvKOb4B+w= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-50-HoSfqRSvNyOmys1Ht87gBg-1; Wed, 30 Aug 2023 09:46:30 -0400 X-MC-Unique: HoSfqRSvNyOmys1Ht87gBg-1 Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-51e3bb0aeedso757014a12.0 for ; Wed, 30 Aug 2023 06:46:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693403189; x=1694007989; 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=uG5M2Lwpie6cChdlBf2i1g6i8ozHuD8iPPR+2gMyfYc=; b=WF+6yazI3VMfQO3YCGesmgftJRjEOdVg27wmzYjsAvL0G9uUb0kdw/bFOLnDIfQhzE ZY7KCzfngwyX/Lwgw0yxH+jbTkCQvrLusxOF0zb5I/lO7JKiGbGMhdDxO7WlBGnMp9Yl WDSCRaFsscTIyQWlNESYElF49bi4fBlIAQ+5gAVaxaYh8BGm1pHdxBPHKGL8o+g8o+IS 2CfhWkBon0Mzswp/NQ93Xx71xAYgkpHZohW5MgUalL0AYQ6cN447b9JfgzwmEqLNksjp odt5G1oAlnTRgv8ehU4anpgvqKX/CCto0KYID9B62h8I9ruWXKJYjwJr52a9hy5rJM/6 OtKw== X-Gm-Message-State: AOJu0Yync4nsffJ5Y3cY3cG4+908GV3wdSv4fpnY+X1qQhSgWZWznwUp ZrUCWGK/MoXU6XFMwY9b+sX7jBsWPK6n579YHEH/YNb86RuJ42hL36XN9XWlZcE6Smcws5owxQ8 gbC3b1YGDY2Jx+TCSzdqjfYOY X-Received: by 2002:a05:6402:50cf:b0:522:e6b0:8056 with SMTP id h15-20020a05640250cf00b00522e6b08056mr1964356edb.4.1693403189068; Wed, 30 Aug 2023 06:46:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHpKYbKxrilyWwmvyGSQuR3YdE5ziBNReJitKpOxi4O0anKghb3+MxxX32nil6cbORrhxRuFQ== X-Received: by 2002:a05:6402:50cf:b0:522:e6b0:8056 with SMTP id h15-20020a05640250cf00b00522e6b08056mr1964344edb.4.1693403188914; Wed, 30 Aug 2023 06:46:28 -0700 (PDT) Received: from fedorinator.fritz.box ([2001:9e8:32e4:1500:aa40:e745:b6c9:7081]) by smtp.gmail.com with ESMTPSA id w23-20020aa7d297000000b0052595b17fd4sm6683260edq.26.2023.08.30.06.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 06:46:28 -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 2/5] kernel: kexec: copy user-array safely Date: Wed, 30 Aug 2023 15:45:53 +0200 Message-ID: <0a3f1bca273792edbdc41b64c454a6f7f499c9a8.1693386602.git.pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 --- kernel/kexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 92d301f98776..f6067c1bb089 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -242,7 +242,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 Sat Feb 7 04:20:54 2026 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 DA257C83F1B for ; Wed, 30 Aug 2023 19:16:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243956AbjH3TNr (ORCPT ); Wed, 30 Aug 2023 15:13:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244713AbjH3Nr7 (ORCPT ); Wed, 30 Aug 2023 09:47:59 -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 48EEA1B0 for ; Wed, 30 Aug 2023 06:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693403195; 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=R2kuY7QrN77OjYcmiIgmsp8RgTy5tijHIGRui0VqTUY=; b=NYFA6JvG/pF4qaCZw2OTy4jhgTU9jzpMZUoZlzJX+TtdOmUPh71IdiReF0OtSbJXyXui0r PTZTtsjaCAvH04EV8duE6cAAZjAKOL2GeGjV+ilYoa1DhmOBXt5bJFYZ29XVMCMtagTW9p f1dQ6TyhHxTgmyZg0eX2vDfKTPG+98U= 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-393-d8SAkmSNPH2hXd6roJqpuw-1; Wed, 30 Aug 2023 09:46:34 -0400 X-MC-Unique: d8SAkmSNPH2hXd6roJqpuw-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9a1c758ef63so61292766b.1 for ; Wed, 30 Aug 2023 06:46:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693403193; x=1694007993; 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=R2kuY7QrN77OjYcmiIgmsp8RgTy5tijHIGRui0VqTUY=; b=gkUt+u7FvYAsbOnfc/Ww6ey4w2ozpAn4P6nsCvzDE2Itm+LxBOcM36xtiT7XCUJjTN obSgWVhGud/3H5kGyskcfOIvi1MPKFFlme6FGsdMXZpU5eHIaqrMoqQXpM/tVam1Z16d Bc1jWtf8j/DIFDnt3Nzrc8j+PSK81d/C0gU5KN1gU4x0C9QlztlzJjTOfY1lTcdl4puv Ocz0rc5UGsQcjIsee1HqH9UnWVcMkhiLERmk6LAgmFDXgZZSmiHyOI/Vme0MSvU3oIXJ 39pQFH5bIuSEotoawHn/XW31zKMcnrsX1Wh+AFuna0W+kbZrWO8KL1eEuZ7CGCb8kR+g fFsw== X-Gm-Message-State: AOJu0YwBVCXjpzVt6OEpnfEhNnBnSN9thymIAuoEtWMElawGu2utMLIz Wqg42HdR0it3z78+dtuokgrV2XxK/ZzkKFdoqwkYIPMJjhAZctDY7Me/jbmO554oumarXPJfr4W 60fuo0EeciDJH4qieFQiqSZdh X-Received: by 2002:a05:6402:51c8:b0:522:3f32:52f1 with SMTP id r8-20020a05640251c800b005223f3252f1mr1737281edd.3.1693403193055; Wed, 30 Aug 2023 06:46:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGf9jsdBfXtDK6B3l1XAhb6uC/SE7H2eq+xyXHHwbpGSepkZ7/eGDvrY6bR1kwu2ebD+wsHwg== X-Received: by 2002:a05:6402:51c8:b0:522:3f32:52f1 with SMTP id r8-20020a05640251c800b005223f3252f1mr1737265edd.3.1693403192770; Wed, 30 Aug 2023 06:46:32 -0700 (PDT) Received: from fedorinator.fritz.box ([2001:9e8:32e4:1500:aa40:e745:b6c9:7081]) by smtp.gmail.com with ESMTPSA id t7-20020aa7d4c7000000b00529fa63ef6fsm6811782edr.57.2023.08.30.06.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 06:46:32 -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 3/5] kernel: watch_queue: copy user-array safely Date: Wed, 30 Aug 2023 15:45:54 +0200 Message-ID: <4168bc2d9313d5d1a1a2b9ca0b9fc2990d499506.1693386602.git.pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 --- 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 Sat Feb 7 04:20:54 2026 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 49C5DC83F22 for ; Wed, 30 Aug 2023 19:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237193AbjH3TAD (ORCPT ); Wed, 30 Aug 2023 15:00:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244715AbjH3Nr7 (ORCPT ); Wed, 30 Aug 2023 09:47:59 -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 1FBF51BB for ; Wed, 30 Aug 2023 06:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693403199; 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=UOJpuwbwTVfs+j95sEE93OpkqtbclA96WzipEC/nM14=; b=Ajc4RXTRaqs5I0UDdsHHKD6sy/q7kOld/OnuN2CnAkzTkUoH/k7h2hGcasWHD0mplFqWls yhRX5UGKO4hQsWFhBhopYsCTPtdn8DJ6eOPhPB69sviPXt0xt7zUFBgQT0ybMxd81HDTCs GVODes/oVN/NS4SfvSQg4sY2JO+pxMM= 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-570-8YP4AMB-P8ucjMNdzh10jw-1; Wed, 30 Aug 2023 09:46:38 -0400 X-MC-Unique: 8YP4AMB-P8ucjMNdzh10jw-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2b6fdb8d0acso19452151fa.0 for ; Wed, 30 Aug 2023 06:46:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693403196; x=1694007996; 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=UOJpuwbwTVfs+j95sEE93OpkqtbclA96WzipEC/nM14=; b=dHitNMAbMAew/ADm2z0fpaeSsRJBdjtqNE5+FIIRPXwjU/FS7vxGNitX6BfUzpTPEY +2Xcg7rpNTu92MWCS+MDn280ThZoRb5Sg9ClVqXIr1IaqtkfZl/w/PGVYIk+njaeM50d Y5fe7zT7/VrZbeQJWGr0TXs85Vzozd4jhloLQ4aQhSMhzeUR+DOUuhxBzRRClt3fHp9M wCsfzJEME+q8kWu+LMMIuC7+oP+CH3hPqaqnQWQj5ubBQK3RaeL4KaIzSEAW9gNhL2dC Mo5wIuWfz4Q0G2Dnx3e0Mx33tp29rhrb2weJw+9ZHpxWOujlIdBwayIB0YBgbQ6cPh+0 l99g== X-Gm-Message-State: AOJu0YyJFEqFGDM5kdt90gsxcGnadmxQS5O4hJDCRYV7FU5WNQHK7Eaw UUw6kdPrNg25QnBnFwwbIOJi/ar6j9m9mwC3oa3mlbhzkldP/pTQ/O80TCiMb2vMYSDk1eDABTv PAwuSFBh8z2BJfk3GLoD2MhUA X-Received: by 2002:a05:651c:1182:b0:2bc:fc2e:766c with SMTP id w2-20020a05651c118200b002bcfc2e766cmr1857340ljo.3.1693403196828; Wed, 30 Aug 2023 06:46:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNBSsy/iFndvURQgQS9ZCnlQ9lW+9HBjOb1QIZNMn1l3Gt7cB24Ma8x0ITyx+CEVBlGHtj+A== X-Received: by 2002:a05:651c:1182:b0:2bc:fc2e:766c with SMTP id w2-20020a05651c118200b002bcfc2e766cmr1857319ljo.3.1693403196642; Wed, 30 Aug 2023 06:46:36 -0700 (PDT) Received: from fedorinator.fritz.box ([2001:9e8:32e4:1500:aa40:e745:b6c9:7081]) by smtp.gmail.com with ESMTPSA id li22-20020a170906f99600b009a198078c53sm7167678ejb.214.2023.08.30.06.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 06:46:36 -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 4/5] drm_lease.c: copy user-array safely Date: Wed, 30 Aug 2023 15:45:55 +0200 Message-ID: <34e14523c9cea13e2f63afabf2938c89d2e84776.1693386602.git.pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 --- 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 Sat Feb 7 04:20:54 2026 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 B78F8C83F1D for ; Wed, 30 Aug 2023 18:54:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245566AbjH3Sx3 (ORCPT ); Wed, 30 Aug 2023 14:53:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244717AbjH3Nr7 (ORCPT ); Wed, 30 Aug 2023 09:47:59 -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 DACDCCC2 for ; Wed, 30 Aug 2023 06:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693403203; 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=w7XXAxDLUmZdx81fESQwCFLbPlVQDp3wBmzbmeWO24M=; b=L6k7jZsZXblYV+GORLNd/Q6avmeL6q27K/1eF1gu/lc61SSUzOMv1hMxDCrj2YbdM/FvFU ytBSviJ2jkyygjXvuz67eCcessNgugbueyvRC9Lg3It3EyxpF62//yx/z7CegKBMcLp6hK zW6YRqcBdiSP9hU/Nxey7dTbfWm/Za0= 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-295-FCtJ_KAjMSqGfYmmn7g7Pg-1; Wed, 30 Aug 2023 09:46:41 -0400 X-MC-Unique: FCtJ_KAjMSqGfYmmn7g7Pg-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9a1aaaf6460so87012366b.1 for ; Wed, 30 Aug 2023 06:46:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693403200; x=1694008000; 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=w7XXAxDLUmZdx81fESQwCFLbPlVQDp3wBmzbmeWO24M=; b=XH7w8S1eEa8b79VSKInRdIez9dLgAGTop2phN2FhYtAwEuFqFlH/9qP+xw66ZitRv4 Lq/fNXxXGr3E2+qLC2i7irXnV6RTx7wsPHYe+BtnNucXqqpKu0b8jl2eRCNdqjztgLN3 fK6fpreyXwgns32QiaCmwz3plgHq5QOGdzUPhvlMbSBAHtyfrwF+v1InMiQ7obWnVLjI VyHvTTryXdqzDIg4m+AQio7X2s+y7HOBYSUiTX+owMKbvurgqdP+GnYPVwDxYVwafXG9 AmRDBIIqPDMERQCK0toXyIdhldflix0YcESgj5KanpHUQuqzi/xLsbM9ymzlO0k8AYC2 +FHw== X-Gm-Message-State: AOJu0YxjKdmLdA6d3dJxCS8FRNJ+qb9UHvlPnP1ERnaxt0MSplObd+hJ bcRoFcXMzVD1cuoA4vEKWJIqAZYP2gYecppziAkwtWMPOQ39+gt5icrw3E6HMr1EF85m+FIc7nO IUpEnDZhBGJKSv8GX+KkNy0El X-Received: by 2002:a17:906:1011:b0:9a1:aea8:cb5a with SMTP id 17-20020a170906101100b009a1aea8cb5amr1574505ejm.1.1693403200684; Wed, 30 Aug 2023 06:46:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFovveJ1gRkNa/hbpuOdO660EpmuFNfSfZvj7MduSJ07LTCEG5M6k7oeDfsA0MPBedrGa9vw== X-Received: by 2002:a17:906:1011:b0:9a1:aea8:cb5a with SMTP id 17-20020a170906101100b009a1aea8cb5amr1574480ejm.1.1693403200487; Wed, 30 Aug 2023 06:46:40 -0700 (PDT) Received: from fedorinator.fritz.box ([2001:9e8:32e4:1500:aa40:e745:b6c9:7081]) by smtp.gmail.com with ESMTPSA id gy25-20020a170906f25900b0098951bb4dc3sm7218566ejb.184.2023.08.30.06.46.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 06:46:40 -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 5/5] drm: vmgfx_surface.c: copy user-array safely Date: Wed, 30 Aug 2023 15:45:56 +0200 Message-ID: <6f9397d6af919b7e8325c2945385c13aaa3dc5f1.1693386602.git.pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 --- 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