Message ID | 20230306090633.65918-1-geert+renesas@glider.be |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1739117wrd; Mon, 6 Mar 2023 01:20:24 -0800 (PST) X-Google-Smtp-Source: AK7set8/u+bKr+Dm0P8qO6xJy/CegS5VisLjfjevfu1J1Q+kBVQ7iZjMMF+ygdslIq9XERhr8n97 X-Received: by 2002:a05:6a20:3b99:b0:cd:159d:f23a with SMTP id b25-20020a056a203b9900b000cd159df23amr9893702pzh.46.1678094424412; Mon, 06 Mar 2023 01:20:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678094424; cv=none; d=google.com; s=arc-20160816; b=yEEToIZaeQghBkDOiZGhGqmAGe+VJ9iH5gnX9r/8szJrvBe3U0lMi4aqYMva4Jy3gr Tcs2fSQinKHsiDIQNWXsRhL530fRvYzoeUPLs0IFLp84nqY7aKDdAqh0QZqk3bYeFj5M HfL/pxqDHH4ZsazYPuUNRem2j92VvrQL2K/LLL320wk7/g7tOcxS16sqyCHHlEdRGkzf qNtn7dKLGWBUhlO91/0jXbmPJuo4YG4SkFg4Z5rTldwMaN2RTBXOgsdAjwW7oA8HQqkK +klYUuZ1+2Ec3lLc4GQXWdL58Hcy5BYWDsp0t5rFUk5JVRgwwSR5RaPm2D+4SQWOkrOG qEEw== 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 :message-id:date:subject:cc:to:from; bh=iufBa0m0gYuFgX1wDn+HFuYDFBqVmzfNb8qwnYA4RIg=; b=fchBwWEwQOHmQix5pJ4ybas3HOyY85cdGTmfKLTTqHQmGaGMwingL8y3U2DY8wHiVl 0zXShBFylDRrfl0aV37cfoMMJ6am4HOQcqS1abPgPmpGrH2L4U2jcPJv8E3MLK/dI/Ej oVQd6J1ER29qyf11j3gfvIpuxzap3/NG8VGRFixfp1dsXI6EK0zcY3y7AdFQMgP4GOnj k2QDXD6BjHtY4uA2ET+ZsiAlgs29z3D92Lwefv1/JTJEgAfKq3WdazYXXrv7IRODSHOP toYupDLwiyYqAgNuJbvnHQBIKhZlMYP02LtQQ8/saw/fFJD5p5Rwim9BToy+5oAOs4H4 jAHw== 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 p6-20020a622906000000b0059258b3c5cbsi8386992pfp.358.2023.03.06.01.20.11; Mon, 06 Mar 2023 01:20:24 -0800 (PST) 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 S229825AbjCFJGt (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Mon, 6 Mar 2023 04:06:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229616AbjCFJGr (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 6 Mar 2023 04:06:47 -0500 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FEDC222CC for <linux-kernel@vger.kernel.org>; Mon, 6 Mar 2023 01:06:44 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed50:b745:671d:a946:57fa]) by xavier.telenet-ops.be with bizsmtp id Ux6a2900J4LuvSS01x6aeG; Mon, 06 Mar 2023 10:06:42 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from <geert@linux-m68k.org>) id 1pZ6nC-00B4Fr-6Q; Mon, 06 Mar 2023 10:06:34 +0100 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from <geert@linux-m68k.org>) id 1pZ6ni-000HC1-5x; Mon, 06 Mar 2023 10:06:34 +0100 From: Geert Uytterhoeven <geert+renesas@glider.be> To: Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Sean Paul <sean@poorly.run>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Vinod Koul <vkoul@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Bjorn Andersson <andersson@kernel.org>, Neil Armstrong <neil.armstrong@linaro.org>, Kuogee Hsieh <quic_khsieh@quicinc.com> Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be> Subject: [PATCH] drm/msm/dpu: Fix bit-shifting UB in DPU_HW_VER() macro Date: Mon, 6 Mar 2023 10:06:33 +0100 Message-Id: <20230306090633.65918-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759609539157237380?= X-GMAIL-MSGID: =?utf-8?q?1759609539157237380?= |
Series |
drm/msm/dpu: Fix bit-shifting UB in DPU_HW_VER() macro
|
|
Commit Message
Geert Uytterhoeven
March 6, 2023, 9:06 a.m. UTC
With gcc-5 and CONFIG_UBSAN_SHIFT=y:
drivers/gpu/drm/msm/msm_mdss.c: In function 'msm_mdss_enable':
drivers/gpu/drm/msm/msm_mdss.c:296:2: error: case label does not reduce to an integer constant
case DPU_HW_VER_800:
^
drivers/gpu/drm/msm/msm_mdss.c:299:2: error: case label does not reduce to an integer constant
case DPU_HW_VER_810:
^
drivers/gpu/drm/msm/msm_mdss.c:300:2: error: case label does not reduce to an integer constant
case DPU_HW_VER_900:
^
This happens because for major revisions 8 or greather, the non-sign bit
of the major revision number is shifted into bit 31 of a signed integer,
which is undefined behavior.
Fix this by casting the major revision number to unsigned int.
Fixes: efcd0107727c4f04 ("drm/msm/dpu: add support for SM8550")
Fixes: 4a352c2fc15aec1e ("drm/msm/dpu: Introduce SC8280XP")
Fixes: 100d7ef6995d1f86 ("drm/msm/dpu: add support for SM8450")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Comments
On 3/6/23 01:06, Geert Uytterhoeven wrote: > With gcc-5 and CONFIG_UBSAN_SHIFT=y: > > drivers/gpu/drm/msm/msm_mdss.c: In function 'msm_mdss_enable': > drivers/gpu/drm/msm/msm_mdss.c:296:2: error: case label does not reduce to an integer constant > case DPU_HW_VER_800: > ^ > drivers/gpu/drm/msm/msm_mdss.c:299:2: error: case label does not reduce to an integer constant > case DPU_HW_VER_810: > ^ > drivers/gpu/drm/msm/msm_mdss.c:300:2: error: case label does not reduce to an integer constant > case DPU_HW_VER_900: > ^ > > This happens because for major revisions 8 or greather, the non-sign bit > of the major revision number is shifted into bit 31 of a signed integer, > which is undefined behavior. > > Fix this by casting the major revision number to unsigned int. > > Fixes: efcd0107727c4f04 ("drm/msm/dpu: add support for SM8550") > Fixes: 4a352c2fc15aec1e ("drm/msm/dpu: Introduce SC8280XP") > Fixes: 100d7ef6995d1f86 ("drm/msm/dpu: add support for SM8450") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > index ddab9caebb18c40d..bbd3cbdd77956c5d 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > @@ -19,8 +19,9 @@ > */ > #define MAX_BLOCKS 12 > > -#define DPU_HW_VER(MAJOR, MINOR, STEP) (((MAJOR & 0xF) << 28) |\ > - ((MINOR & 0xFFF) << 16) |\ > +#define DPU_HW_VER(MAJOR, MINOR, STEP) \ > + ((((unsigned int)MAJOR & 0xF) << 28) | \ > + ((MINOR & 0xFFF) << 16) | \ > (STEP & 0xFFFF)) > > #define DPU_HW_MAJOR(rev) ((rev) >> 28)
On Tue, Mar 21, 2023 at 8:08 AM Randy Dunlap <rdunlap@infradead.org> wrote: > > > > On 3/6/23 01:06, Geert Uytterhoeven wrote: > > With gcc-5 and CONFIG_UBSAN_SHIFT=y: > > > > drivers/gpu/drm/msm/msm_mdss.c: In function 'msm_mdss_enable': > > drivers/gpu/drm/msm/msm_mdss.c:296:2: error: case label does not reduce to an integer constant > > case DPU_HW_VER_800: > > ^ > > drivers/gpu/drm/msm/msm_mdss.c:299:2: error: case label does not reduce to an integer constant > > case DPU_HW_VER_810: > > ^ > > drivers/gpu/drm/msm/msm_mdss.c:300:2: error: case label does not reduce to an integer constant > > case DPU_HW_VER_900: > > ^ > > > > This happens because for major revisions 8 or greather, the non-sign bit > > of the major revision number is shifted into bit 31 of a signed integer, > > which is undefined behavior. > > > > Fix this by casting the major revision number to unsigned int. > > > > Fixes: efcd0107727c4f04 ("drm/msm/dpu: add support for SM8550") > > Fixes: 4a352c2fc15aec1e ("drm/msm/dpu: Introduce SC8280XP") > > Fixes: 100d7ef6995d1f86 ("drm/msm/dpu: add support for SM8450") > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Reviewed-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Rob Clark <robdclark@gmail.com> > > Thanks. > > > --- > > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > > index ddab9caebb18c40d..bbd3cbdd77956c5d 100644 > > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > > @@ -19,8 +19,9 @@ > > */ > > #define MAX_BLOCKS 12 > > > > -#define DPU_HW_VER(MAJOR, MINOR, STEP) (((MAJOR & 0xF) << 28) |\ > > - ((MINOR & 0xFFF) << 16) |\ > > +#define DPU_HW_VER(MAJOR, MINOR, STEP) \ > > + ((((unsigned int)MAJOR & 0xF) << 28) | \ > > + ((MINOR & 0xFFF) << 16) | \ > > (STEP & 0xFFFF)) > > > > #define DPU_HW_MAJOR(rev) ((rev) >> 28) > > -- > ~Randy
On Mon, 06 Mar 2023 10:06:33 +0100, Geert Uytterhoeven wrote: > With gcc-5 and CONFIG_UBSAN_SHIFT=y: > > drivers/gpu/drm/msm/msm_mdss.c: In function 'msm_mdss_enable': > drivers/gpu/drm/msm/msm_mdss.c:296:2: error: case label does not reduce to an integer constant > case DPU_HW_VER_800: > ^ > drivers/gpu/drm/msm/msm_mdss.c:299:2: error: case label does not reduce to an integer constant > case DPU_HW_VER_810: > ^ > drivers/gpu/drm/msm/msm_mdss.c:300:2: error: case label does not reduce to an integer constant > case DPU_HW_VER_900: > ^ > > [...] Applied, thanks! [1/1] drm/msm/dpu: Fix bit-shifting UB in DPU_HW_VER() macro https://gitlab.freedesktop.org/lumag/msm/-/commit/c8f370bde5b9 Best regards,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index ddab9caebb18c40d..bbd3cbdd77956c5d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -19,8 +19,9 @@ */ #define MAX_BLOCKS 12 -#define DPU_HW_VER(MAJOR, MINOR, STEP) (((MAJOR & 0xF) << 28) |\ - ((MINOR & 0xFFF) << 16) |\ +#define DPU_HW_VER(MAJOR, MINOR, STEP) \ + ((((unsigned int)MAJOR & 0xF) << 28) | \ + ((MINOR & 0xFFF) << 16) | \ (STEP & 0xFFFF)) #define DPU_HW_MAJOR(rev) ((rev) >> 28)