From nobody Wed Dec 31 13:04:15 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 0D1ADC4332F for ; Thu, 2 Nov 2023 18:16:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377144AbjKBSQ4 (ORCPT ); Thu, 2 Nov 2023 14:16:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234422AbjKBSQx (ORCPT ); Thu, 2 Nov 2023 14:16:53 -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 17EB0193 for ; Thu, 2 Nov 2023 11:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698948964; 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=lX9pDYhUv0xNWCwt2hkI8FAcvsPw051Wv1MARO9LEh8=; b=FOVvAT9jGjFKOX7lJDq9F37aroIE+8WU6feEIfqXeISriC1ts5Xx3602+JtGBl6a+jpUhe wJG4UQo5iy+gzT/q86rTsO/05Qw3QKtc5uh4nqhDXNBDDUJfXHMmWuKrjD8Pwpnbbx5Ft3 eCC03cX6M/SyNxrwuNcgAINoQ27spyo= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-310-WYQY4-eEMGiSE7At3GEVbA-1; Thu, 02 Nov 2023 14:16:02 -0400 X-MC-Unique: WYQY4-eEMGiSE7At3GEVbA-1 Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2c56c75ea84so2546641fa.1 for ; Thu, 02 Nov 2023 11:16:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698948961; x=1699553761; 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=lX9pDYhUv0xNWCwt2hkI8FAcvsPw051Wv1MARO9LEh8=; b=hNxZKbsPbFE0mdpukCGclcphJjVba8bcrU53IpzeYjcxjPrOdt+fsOHNtS3ym2Cq+5 E5QoWsx47mgvS300tlplOkY3i2OcJPjUoH2FvTfz98pphalsUJmIwrOy4Ozx92dXQ5C7 NQbSpAM8VSNBzkSku/sLyFsFWhPilLVtcKd0FLFm2bylTbwIwsijPMZhgslidAdPui/7 5SIwXAX/EOgbF6mnWjlu7gPKAorhaVjCWHz97dMhG0HgnV+56V/juzcz0lmP5VIP9Giq VrYJQu8mxBEpzDUCfDek9omAtDY2aDRBKds50fHYhjSUTWCcERa7CDtFy24ehALFuLAf WD1w== X-Gm-Message-State: AOJu0YzrYGgT9fPYuzyHEAxzi8boyXIT6VNXZxVZb8Ad7FO/97hA52tl 12pK9p+qJFVz8wYwrb/rBh/5o+CvzakIz6YRTKSJZftDL2O4hUNEuYpoU2AG++kbXkzq0xr/ZhZ L2WTHuxjaqApUtZtJk6rCHJkf X-Received: by 2002:a2e:b5cd:0:b0:2c0:7d6:1349 with SMTP id g13-20020a2eb5cd000000b002c007d61349mr13191938ljn.0.1698948960946; Thu, 02 Nov 2023 11:16:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEA9GFg/9wbEsQk9hiRtyKr5Sw8+tU0lzjpfffLtjFPJgequPAx/iZqfrIIRwYQeDUno1rPwQ== X-Received: by 2002:a2e:b5cd:0:b0:2c0:7d6:1349 with SMTP id g13-20020a2eb5cd000000b002c007d61349mr13191934ljn.0.1698948960612; Thu, 02 Nov 2023 11:16:00 -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.15.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 11:16:00 -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 1/3] arch/x86/kvm: copy user-array with overflow-check Date: Thu, 2 Nov 2023 19:15:24 +0100 Message-ID: <20231102181526.43279-2-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" cpuid.c utilizes vmemdup_user() and array_size() to copy two userspace arrays. This, currently, does not check for an overflow. Use the new wrapper vmemdup_array_user() to copy the arrays more safely. Suggested-by: Dave Airlie Signed-off-by: Philipp Stanner Acked-by: Christian Borntraeger --- arch/x86/kvm/cpuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 773132c3bf5a..4a15b2a20f84 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -467,7 +467,7 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, return -E2BIG; =20 if (cpuid->nent) { - e =3D vmemdup_user(entries, array_size(sizeof(*e), cpuid->nent)); + e =3D vmemdup_array_user(entries, cpuid->nent, sizeof(*e)); if (IS_ERR(e)) return PTR_ERR(e); =20 @@ -511,7 +511,7 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, return -E2BIG; =20 if (cpuid->nent) { - e2 =3D vmemdup_user(entries, array_size(sizeof(*e2), cpuid->nent)); + e2 =3D vmemdup_array_user(entries, cpuid->nent, sizeof(*e2)); if (IS_ERR(e2)) return PTR_ERR(e2); } --=20 2.41.0 From nobody Wed Dec 31 13:04:15 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 8E12EC4332F for ; Thu, 2 Nov 2023 18:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377198AbjKBSRB (ORCPT ); Thu, 2 Nov 2023 14:17:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235149AbjKBSQy (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.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8556A194 for ; Thu, 2 Nov 2023 11:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698948964; 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=zgG3A5hpFrp+6V7xcOap0dfvpVeqP5J5h/8swybWPW8=; b=AmKeNG6e5TGAmov2bQOQ1EysZ4KQklR/7TXeewd+jGPyLxfPHn5T9d0BEEvy/xefL6F1MB IWHk/IoFW9gAe01jfrFvoNErDm+78E+A8DJSFnAFYrp26F4FlSjI3TQIH0A/hIrRhYjZ/9 4vak1+LpLGk/nmbSVc5rqCJqFyZPiAM= 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-595-lGH64hU8O6e7uXzPjSK1ZA-1; Thu, 02 Nov 2023 14:16:03 -0400 X-MC-Unique: lGH64hU8O6e7uXzPjSK1ZA-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4083a0fb583so1417885e9.1 for ; Thu, 02 Nov 2023 11:16:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698948962; x=1699553762; 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=zgG3A5hpFrp+6V7xcOap0dfvpVeqP5J5h/8swybWPW8=; b=ZsgiLVjWAAudh31TEr8FuJaIMcBG1k8OSybA9I6RRMpqxWy5uLfGjeTwzRITe6Pcw+ GG99TEGdibRIqM8bnBGjdMYAI7TsLjIn7Td/w89pr7i38kU1OAtFpwvLYvZ3gHCPBWG+ J0eRKKdPeERK85Fl8Bf/pXVuHOjGmo2J4HZohrbye5v7I2Yy9Tt7WOFS7ob1o6KAoKEO grnh1aldEuhJSVEUbbaqbQIgEztwKC2nK2OjIbJP3w4pekWyyhyc5BHUZmuKyLR22qAI JpYK+yhcLgIYFk0+nk+t+ia0Gk6AztWMH63scv9gY4ZcVpCo69ak1SpOL/1PIAWQCbZJ eM4A== X-Gm-Message-State: AOJu0YxaBwGUWDcDLafm+WCRel6gUpOBcX6AtKhsMJ2xJtbZslK7vZlI 2fY9NkYT09CcKC4vYQmm8ikrxLfV8Z+z4G3qSZfufVR2Xv29xjL9ggrxQ9sFkEekylyn+H2iAfR he1zrOaJigBjGp3QV3WQQ1lbv X-Received: by 2002:a05:600c:510a:b0:405:1ba2:4fcf with SMTP id o10-20020a05600c510a00b004051ba24fcfmr15629793wms.4.1698948962009; Thu, 02 Nov 2023 11:16:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjTetfCnz62A+Ip2Hdlm3nuttWd2b6W3o5YuoU7reIi83z2x4Kzw5EwS3QOFs2J4hJ+0CIUg== X-Received: by 2002:a05:600c:510a:b0:405:1ba2:4fcf with SMTP id o10-20020a05600c510a00b004051ba24fcfmr15629783wms.4.1698948961745; Thu, 02 Nov 2023 11:16:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 11:16:01 -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 2/3] arch/s390/kvm: copy userspace-array safely Date: Thu, 2 Nov 2023 19:15:25 +0100 Message-ID: <20231102181526.43279-3-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" guestdbg.c utilizes memdup_user() to copy a userspace array. This, currently, does not check for an overflow. Use the new wrapper memdup_array_user() to copy the array more safely. Suggested-by: Dave Airlie Signed-off-by: Philipp Stanner Acked-by: Christian Borntraeger Acked-by: Claudio Imbrenda --- arch/s390/kvm/guestdbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/kvm/guestdbg.c b/arch/s390/kvm/guestdbg.c index 3765c4223bf9..80879fc73c90 100644 --- a/arch/s390/kvm/guestdbg.c +++ b/arch/s390/kvm/guestdbg.c @@ -213,8 +213,8 @@ int kvm_s390_import_bp_data(struct kvm_vcpu *vcpu, else if (dbg->arch.nr_hw_bp > MAX_BP_COUNT) return -EINVAL; =20 - bp_data =3D memdup_user(dbg->arch.hw_bp, - sizeof(*bp_data) * dbg->arch.nr_hw_bp); + bp_data =3D memdup_array_user(dbg->arch.hw_bp, dbg->arch.nr_hw_bp, + sizeof(*bp_data)); if (IS_ERR(bp_data)) return PTR_ERR(bp_data); =20 --=20 2.41.0 From nobody Wed Dec 31 13:04:15 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 Acked-by: Christian Borntraeger --- 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