From nobody Wed Dec 31 14:58:40 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 949BAC4332F for ; Thu, 2 Nov 2023 18:17:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347228AbjKBSRI (ORCPT ); Thu, 2 Nov 2023 14:17:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234335AbjKBSQy (ORCPT ); Thu, 2 Nov 2023 14:16:54 -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 A70A7137 for ; Thu, 2 Nov 2023 11:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698948966; 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=yH09Py8IYRdWEq70yMXJ3wDczRklXyABpCu4Oku+uko=; b=craN23vT94oPqNZLksryG1IPTEnP2L66If6HlaOlqgS4HvWCYcsgULTK90mADicboyK1GW G9aSDOzU95GWp8FkLQrOky9N3TarrFoMvvOYPsLLsNh1/i+UQNWrAh1bFHJfy4FHQs7NYA Rx8yRpIFDCkt6ISsEsHfZieKNsIgQes= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-256-azxNW6RgMiKT8INuitfV3Q-1; Thu, 02 Nov 2023 14:16:04 -0400 X-MC-Unique: azxNW6RgMiKT8INuitfV3Q-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-507df68e881so307285e87.0 for ; Thu, 02 Nov 2023 11:16:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698948963; x=1699553763; 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=yH09Py8IYRdWEq70yMXJ3wDczRklXyABpCu4Oku+uko=; b=rn2l5TwB5aoyJFv7KjW57Jn6zpW2UvmZ1EhsWf0XYAVlsplqTZHhjk4CwRlbw/tP7d EsXUek7NxvU5q3CAEbn89l3tkHYvz+1X2ZFTM8GgPHnH2FwzI/uRCRGHzG0+0VrYex3C KtMUJszJcrwvbcYPr9dNMgQMgj/vzY9dYgwWpzLE9j9KtS9DqAYEXQssgzyar7+23r65 dXeFE6qRIedSuvb+NmCnMxtmspkk7VDNAwzCsg/57k+UgNwcNhf/q9YkCwRla97QuFtO j1/K8hYhJS6U9ptzYXiJFTR41xqJKM+nUDBLVDt+C3NnScVw7FHgDWrnsSgSR/cVxypK 0W5g== X-Gm-Message-State: AOJu0Yw5IgvHTPDhj/1rHp59lBjMnlRWwa3uNXWvx4jKf+wyZ0OEhKng EYAVT9n0x/aC5/ClqmSXEYhGfsdikTdT1BVnFRcp3QmcraiV2UB5ftupnnFxaDOJb4LzcjgBDeU RYnlB5mhsJaL0rPAjkA8xSp+I X-Received: by 2002:a2e:9695:0:b0:2c4:ff24:b02e with SMTP id q21-20020a2e9695000000b002c4ff24b02emr14483934lji.3.1698948963410; Thu, 02 Nov 2023 11:16:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFS1zGZUHtg3KOcze+sfSekgUGd8coQqnik/gqhe4Qn0cg6IP3P+fkjw/XDjmt/1fT6T4eXsA== X-Received: by 2002:a2e:9695:0:b0:2c4:ff24:b02e with SMTP id q21-20020a2e9695000000b002c4ff24b02emr14483906lji.3.1698948963067; Thu, 02 Nov 2023 11:16:03 -0700 (PDT) Received: from pstanner-thinkpadt14sgen1.remote.csb ([2001:9e8:32c5:d600:227b:d2ff:fe26:2a7a]) by smtp.gmail.com with ESMTPSA id m28-20020a05600c3b1c00b004076f522058sm3879929wms.0.2023.11.02.11.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 11:16:02 -0700 (PDT) From: Philipp Stanner To: Christian Borntraeger , Janosch Frank , Claudio Imbrenda , David Hildenbrand , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, Philipp Stanner , Dave Airlie Subject: [PATCH 3/3] virt/kvm: copy userspace-array safely Date: Thu, 2 Nov 2023 19:15:26 +0100 Message-ID: <20231102181526.43279-4-pstanner@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231102181526.43279-1-pstanner@redhat.com> References: <20231102181526.43279-1-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" kvm_main.c utilizes vmemdup_user() and array_size() to copy a userspace array. Currently, this does not check for an overflow. Use the new wrapper vmemdup_array_user() to copy the array more safely. Suggested-by: Dave Airlie Signed-off-by: Philipp Stanner --- virt/kvm/kvm_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 486800a7024b..2a2f409c2a7d 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4932,9 +4932,8 @@ static long kvm_vm_ioctl(struct file *filp, goto out; if (routing.nr) { urouting =3D argp; - entries =3D vmemdup_user(urouting->entries, - array_size(sizeof(*entries), - routing.nr)); + entries =3D vmemdup_array_user(urouting->entries, + routing.nr, sizeof(*entries)); if (IS_ERR(entries)) { r =3D PTR_ERR(entries); goto out; --=20 2.41.0