From nobody Wed Dec 31 12:26:06 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 E2EF8C4332F for ; Thu, 2 Nov 2023 19:22:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345798AbjKBTWr (ORCPT ); Thu, 2 Nov 2023 15:22:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234296AbjKBTWq (ORCPT ); Thu, 2 Nov 2023 15:22:46 -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 23F3F18C for ; Thu, 2 Nov 2023 12:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698952922; 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; bh=gMbvaW7xFMUV0KcreKNTNoj1dffs08hfun7sVblosFo=; b=W11wx1jL8w+9uL2q8KDkPBOaGvVbXJdqMML9fEnx9VMdngtHEch9sfd+0X7OoOlG64qbjg Anzi67iIkNgrmZeXs9V2KVn/KKR8UIAfaC+BRr9JIBBhcmzjdf8EeZOsQQj7njNEvOqos9 BwrSLmjnJSpq9pEvEnvTPS+CghgQFDk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-zLzjRFtoM5KatsAlfDD-HA-1; Thu, 02 Nov 2023 15:22:00 -0400 X-MC-Unique: zLzjRFtoM5KatsAlfDD-HA-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40856440f41so2739945e9.1 for ; Thu, 02 Nov 2023 12:22:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698952919; x=1699557719; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gMbvaW7xFMUV0KcreKNTNoj1dffs08hfun7sVblosFo=; b=EFyx84n5suHhEVsM1QdFSZEGlqvZoW02XFXcH90/AeNRpJXJ0I1/Bi68fD4F3Jg9I/ XhvRGSARp/xTkaqqX7//naSr/RT+ML5phb7dCsMGukPoLd/6LX3ccHP8tR6mlz2ToXs/ trvDbrfX8O8FZCeyXbafzk8YJz5tJH9QzeGebwd+iQe9TsQibdZ2smC+YmR0V+S8tJfz 3X8Unt9xUQl6vE4BtgQdhHjlIOBAVDKqfDJ0MGHDG1p2BmvKBVmNRs+GVdOT1kw8Nrh5 LVls6dODjd8Wg45sBwuuSjiDmQrdO0Ivu+WeGtgbEJr0JPbWORrskGEaGJh/d+OZJzWk V/wg== X-Gm-Message-State: AOJu0YyhDasT+fBZdeUQ5kIoHhYraq8hrGqHcxHXk+PgqshxwTxA15dL iVAc+NXxguQYMqBDU5ZBAHqe29VEXXSW6d4ZLEpebvl/8HBAHTgYBg+Ipo4ppLHYwuDAdYhq+aH HPevSEEBg87gwaR82Jl20DznK X-Received: by 2002:a5d:6b06:0:b0:32f:7648:18b6 with SMTP id v6-20020a5d6b06000000b0032f764818b6mr9906418wrw.6.1698952919689; Thu, 02 Nov 2023 12:21:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3mjA4NEtrXUS/d0Brl+TuRNJcpgXcLj1pTDEgegrB7GTIvz59l85VBE10bZg+13/IBsEvHA== X-Received: by 2002:a5d:6b06:0:b0:32f:7648:18b6 with SMTP id v6-20020a5d6b06000000b0032f764818b6mr9906408wrw.6.1698952919393; Thu, 02 Nov 2023 12:21:59 -0700 (PDT) Received: from pstanner-thinkpadt14sgen1.remote.csb ([2001:9e8:32c5:d600:227b:d2ff:fe26:2a7a]) by smtp.gmail.com with ESMTPSA id c18-20020a5d5292000000b0032da87e32e2sm119892wrv.4.2023.11.02.12.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 12:21:59 -0700 (PDT) From: Philipp Stanner To: Greg Kroah-Hartman , Jiri Slaby , Philipp Stanner , Andrew Morton , Kefeng Wang , Tony Luck , Ard Biesheuvel Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Dave Airlie Subject: [PATCH] drivers/tty/vt: copy userspace arrays safely Date: Thu, 2 Nov 2023 20:21:35 +0100 Message-ID: <20231102192134.53301-2-pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 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" The functions (v)memdup_user() are utilized to copy userspace arrays. This is done without overflow checks. Use the new wrappers memdup_array_user() and vmemdup_array_user() to copy the arrays more safely. Suggested-by: Dave Airlie Signed-off-by: Philipp Stanner --- drivers/tty/vt/consolemap.c | 2 +- drivers/tty/vt/keyboard.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c index f02d21e2a96e..313cef3322eb 100644 --- a/drivers/tty/vt/consolemap.c +++ b/drivers/tty/vt/consolemap.c @@ -644,7 +644,7 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struc= t unipair __user *list) if (!ct) return 0; =20 - unilist =3D vmemdup_user(list, array_size(sizeof(*unilist), ct)); + unilist =3D vmemdup_array_user(list, ct, sizeof(*unilist)); if (IS_ERR(unilist)) return PTR_ERR(unilist); =20 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 1fe6107b539b..802ceb0a5e4c 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -1773,8 +1773,8 @@ int vt_do_diacrit(unsigned int cmd, void __user *udp,= int perm) =20 if (ct) { =20 - dia =3D memdup_user(a->kbdiacr, - sizeof(struct kbdiacr) * ct); + dia =3D memdup_array_user(a->kbdiacr, + ct, sizeof(struct kbdiacr)); if (IS_ERR(dia)) return PTR_ERR(dia); =20 @@ -1811,8 +1811,8 @@ int vt_do_diacrit(unsigned int cmd, void __user *udp,= int perm) return -EINVAL; =20 if (ct) { - buf =3D memdup_user(a->kbdiacruc, - ct * sizeof(struct kbdiacruc)); + buf =3D memdup_array_user(a->kbdiacruc, + ct, sizeof(struct kbdiacruc)); if (IS_ERR(buf)) return PTR_ERR(buf); }=20 --=20 2.41.0