Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp602966iog; Mon, 13 Jun 2022 08:58:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vCpWZaWri/RAb0E04JwaDSDD3jQmblq9S08RtF/XgXtCHm0VAfqxGNV802wlDs6Az1Y8r6 X-Received: by 2002:a17:907:60cb:b0:711:d516:ebab with SMTP id hv11-20020a17090760cb00b00711d516ebabmr446313ejc.159.1655135919331; Mon, 13 Jun 2022 08:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655135919; cv=none; d=google.com; s=arc-20160816; b=pIj5bX+esZgLG6jD49AHlTlfX+mYUFNT6saIEb6ceGFzI7V+uyV4TXlUM5LSOxj91C SAFxdSGZ5FJD2JltXb5vsboLSuKniWFZSGtxnTLHi0PDPcCfKLmj8r7B/upIms+C7zSB kLTeBSP5YjHUjk4niM2ipRoQavN6rB5EoqVdkZDwn2LPFlnPL912fzCGgEH9Z3lp03EL l2ax7n2IFqGheVmGPtO4lnPj/M6YsWHmsUtBOQYSUzKShwxjGYDrRAGC2lSd0t7yeXih KMWVuR9Qcsmzgt9s0Oi5KgUdz1a77/3t9kfqkSAVOfdUHIdAXic45L2r1ThRDP1M0zb5 Pq1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+494GMRpT/WcLMCtYfSI0bpS9JWk39i8vLBd1gPOp9A=; b=Zhj3XG7FnTzCzArHUYma3CQinuR5EenDeEUmX+bSGBlAKelw2mCzlIH9LSQelLGnzl H08gsSkV5UbyjR2s1bO/sYfuW2hNeaoMFrk0P4mboFxaIvOqofVqOJeMErU3II+QCytB k0X/fgBhZCKKlk5lkxau0eIbUJQS1+p72Rt3eTLpFF/OLqZXNX9+KQ9SOmcu7spifUxI qm+k8UzV29bPIp8XOAj6QUjOeR+YiTxadq3GCJ9b/rRC49HJt6DlwDOnY0uO+Oei0vPj HGJYo0aodJUevpKboB7WjiPS8fXQQ2N+m0xBo26ERGxDEn7DKqejN/PgmIhmAW0k3Zbn 1Htw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ot79oLwa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a50e44e000000b0042f4ae66c4asi7779091edm.148.2022.06.13.08.58.14; Mon, 13 Jun 2022 08:58:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ot79oLwa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348920AbiFMK4m (ORCPT + 99 others); Mon, 13 Jun 2022 06:56:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349281AbiFMKyS (ORCPT ); Mon, 13 Jun 2022 06:54:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FB6F2F3A5; Mon, 13 Jun 2022 03:28:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 12EE660AEB; Mon, 13 Jun 2022 10:28:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B4EFC3411C; Mon, 13 Jun 2022 10:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655116080; bh=quui/XcBuVEhwDXWWV0qR5h2GQ+QiIDuw0jFKvkJ/sM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ot79oLwavr+wzwQ1VGv8hS2mPlIU+mNTsd9UeBcCvDpbxUAGXMVf/KE32zza8F/Sh LNYK4sSew6W8byBSbgw6FOtLB+/RpchUbrhrXc2aBn+sfTvTNQAsLrPT1kQCdiRDQY jmlnNMQqf3qi+enh594fQ9/iXoPF4zfnbrtlEH80= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Airlie , Alex Deucher Subject: [PATCH 4.14 114/218] drm/amdgpu/cs: make commands with 0 chunks illegal behaviour. Date: Mon, 13 Jun 2022 12:09:32 +0200 Message-Id: <20220613094924.022047372@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094908.257446132@linuxfoundation.org> References: <20220613094908.257446132@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Airlie commit 31ab27b14daaa75541a415c6794d6f3567fea44a upstream. Submitting a cs with 0 chunks, causes an oops later, found trying to execute the wrong userspace driver. MESA_LOADER_DRIVER_OVERRIDE=v3d glxinfo [172536.665184] BUG: kernel NULL pointer dereference, address: 00000000000001d8 [172536.665188] #PF: supervisor read access in kernel mode [172536.665189] #PF: error_code(0x0000) - not-present page [172536.665191] PGD 6712a0067 P4D 6712a0067 PUD 5af9ff067 PMD 0 [172536.665195] Oops: 0000 [#1] SMP NOPTI [172536.665197] CPU: 7 PID: 2769838 Comm: glxinfo Tainted: P O 5.10.81 #1-NixOS [172536.665199] Hardware name: To be filled by O.E.M. To be filled by O.E.M./CROSSHAIR V FORMULA-Z, BIOS 2201 03/23/2015 [172536.665272] RIP: 0010:amdgpu_cs_ioctl+0x96/0x1ce0 [amdgpu] [172536.665274] Code: 75 18 00 00 4c 8b b2 88 00 00 00 8b 46 08 48 89 54 24 68 49 89 f7 4c 89 5c 24 60 31 d2 4c 89 74 24 30 85 c0 0f 85 c0 01 00 00 <48> 83 ba d8 01 00 00 00 48 8b b4 24 90 00 00 00 74 16 48 8b 46 10 [172536.665276] RSP: 0018:ffffb47c0e81bbe0 EFLAGS: 00010246 [172536.665277] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 [172536.665278] RDX: 0000000000000000 RSI: ffffb47c0e81be28 RDI: ffffb47c0e81bd68 [172536.665279] RBP: ffff936524080010 R08: 0000000000000000 R09: ffffb47c0e81be38 [172536.665281] R10: ffff936524080010 R11: ffff936524080000 R12: ffffb47c0e81bc40 [172536.665282] R13: ffffb47c0e81be28 R14: ffff9367bc410000 R15: ffffb47c0e81be28 [172536.665283] FS: 00007fe35e05d740(0000) GS:ffff936c1edc0000(0000) knlGS:0000000000000000 [172536.665284] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [172536.665286] CR2: 00000000000001d8 CR3: 0000000532e46000 CR4: 00000000000406e0 [172536.665287] Call Trace: [172536.665322] ? amdgpu_cs_find_mapping+0x110/0x110 [amdgpu] [172536.665332] drm_ioctl_kernel+0xaa/0xf0 [drm] [172536.665338] drm_ioctl+0x201/0x3b0 [drm] [172536.665369] ? amdgpu_cs_find_mapping+0x110/0x110 [amdgpu] [172536.665372] ? selinux_file_ioctl+0x135/0x230 [172536.665399] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] [172536.665403] __x64_sys_ioctl+0x83/0xb0 [172536.665406] do_syscall_64+0x33/0x40 [172536.665409] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2018 Signed-off-by: Dave Airlie Cc: stable@vger.kernel.org Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -84,7 +84,7 @@ static int amdgpu_cs_parser_init(struct int ret; if (cs->in.num_chunks == 0) - return 0; + return -EINVAL; chunk_array = kmalloc_array(cs->in.num_chunks, sizeof(uint64_t), GFP_KERNEL); if (!chunk_array)