From patchwork Thu Jul 13 13:17:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 119887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1821261vqm; Thu, 13 Jul 2023 06:22:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlEd0AtXwEI5q1mEpzjgUsFTZlVdJ4D8nC9loUhqSxzSVS+NainkKiy0lgFEvw3La4SF8/9/ X-Received: by 2002:aa7:d4c7:0:b0:51d:d4c3:6858 with SMTP id t7-20020aa7d4c7000000b0051dd4c36858mr1851190edr.12.1689254558292; Thu, 13 Jul 2023 06:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689254558; cv=none; d=google.com; s=arc-20160816; b=uSlvQ4AQObKlc2OguagfnGzApOZVyQ+CidunBcNBcEQPU05TosUVFHfEjZwZ6jNfdl iWUA7sgg/o4fYvVE7DFBCVhtyJFx0iC9jdJoESEcD1kM2XcgDMWjFy8LPMYEUwAB3oiT CD1fn0rbppiUtLZJp/dbbH4XzAx4pK7Dpjo1x9ybqhYdf+RAOz/pm3f4JH8xmfV/uLAr kRKM+UUT2q3BCGh2K6HCPAnn9/kliRHjkfxr5qbgoVTqrkCHbXUDKDgtiHNgOsCYrAk7 KX9kJeDCn+iqO6ZlRta/Gl3uNv6C95tos81na8TONC/MUZuOq7dkEekVrUnM0nGm/Ut/ b9Ow== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=upsR0EQflRzVJg5f3axK8d7HO6BKHnExZeYGh88QMjI=; fh=wcJXU+GRAJ+lFf7so8itXL2pGJ6fujr2XomH/f1be3s=; b=AHZ7xLOs+bUKoaHo6aKUuIhcfvY3Z5Vzy+ZYga8ZueXX2bfQaiVVLWvLeec6cI7omJ todgv/oMQHTMz6PLhPWh3vzwVSz32i4c21nYTO0OFj2b/HauYbVs75WdbM7tudwaM2Pz +91BA+3Bwc/ycF0LxaImQeWEKuGlSnMOqPMKntwwo+sT+vMUekhr8yzVtzeYTm1Z3G+N yYqTrYx33wwMiEkZjo7QUKBrZR2Zvy/6oL8+s0E04rLSljFQwYiklnQsTvAW52rvsuiR 0+CqPsSihVqGWYKytf8poldt6o1YOVpDeHXx/2mhfdyzPGDNzNZudU3IZdVt2MHN4g5D hZnw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i8-20020a056402054800b0051e0ecd88dcsi6943131edx.687.2023.07.13.06.22.14; Thu, 13 Jul 2023 06:22:38 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232943AbjGMNRz (ORCPT + 99 others); Thu, 13 Jul 2023 09:17:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234806AbjGMNRb (ORCPT ); Thu, 13 Jul 2023 09:17:31 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A01E270D for ; Thu, 13 Jul 2023 06:17:25 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:6264:77e5:42e2:477d]) by michel.telenet-ops.be with bizsmtp id LdHN2A00Z3wy6xv06dHNad; Thu, 13 Jul 2023 15:17:23 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qJwC3-001Gqq-0u; Thu, 13 Jul 2023 15:17:22 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qJwCA-00GWyY-N9; Thu, 13 Jul 2023 15:17:22 +0200 From: Geert Uytterhoeven To: Javier Martinez Canillas , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/8] drm/dumb-buffers: Fix drm_mode_create_dumb() for bpp < 8 Date: Thu, 13 Jul 2023 15:17:10 +0200 Message-Id: <5ba8ac5e465121b646a59487dc75b27017e0c769.1689252746.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771311787664315250 X-GMAIL-MSGID: 1771311787664315250 drm_mode_create_dumb() calculates the number of characters per pixel from the number of bits per pixel by rounding up, which is not correct as the actual value of cpp may be non-integer. While we do not need to care here about complex formats like YUV, bpp < 8 is a valid use case. - The overflow check for the buffer width is not correct if bpp < 8. However, it doesn't hurt, as widths larger than U32_MAX / 8 should not happen for real anyway. Add a comment to clarify. - Calculating the stride from the number of characters per pixel is not correct. Fix this by calculating it from the number of bits per pixel instead. Signed-off-by: Geert Uytterhoeven Reviewed-by: Javier Martinez Canillas --- Why is drm_mode_create_dumb.size __u64? The test for "args->height > U32_MAX / stride" rejects all sizes not fitting in __u32 anyway. --- drivers/gpu/drm/drm_dumb_buffers.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_dumb_buffers.c b/drivers/gpu/drm/drm_dumb_buffers.c index 70032bba1c97e787..21a04c32a5e3d785 100644 --- a/drivers/gpu/drm/drm_dumb_buffers.c +++ b/drivers/gpu/drm/drm_dumb_buffers.c @@ -71,10 +71,11 @@ int drm_mode_create_dumb(struct drm_device *dev, /* overflow checks for 32bit size calculations */ if (args->bpp > U32_MAX - 8) return -EINVAL; + /* Incorrect (especially if bpp < 8), but doesn't hurt much */ cpp = DIV_ROUND_UP(args->bpp, 8); if (cpp > U32_MAX / args->width) return -EINVAL; - stride = cpp * args->width; + stride = DIV_ROUND_UP(args->bpp * args->width, 8); if (args->height > U32_MAX / stride) return -EINVAL;