From mboxrd@z Thu Jan 1 00:00:00 1970 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 18014C433EF for ; Wed, 6 Apr 2022 16:07:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237094AbiDFQIz (ORCPT ); Wed, 6 Apr 2022 12:08:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238367AbiDFQIl (ORCPT ); Wed, 6 Apr 2022 12:08:41 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48DB22B4A4B; Tue, 5 Apr 2022 21:17:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649218623; x=1680754623; h=message-id:subject:from:to:cc:date:in-reply-to: references:mime-version:content-transfer-encoding; bh=mqH7z+67UJ3aSBQZLGAzbRcUX3Z7J38wJRCxzX1Fenw=; b=J6vThwtFB7uovOqnw7Zf5NqGQJVcUDQQfAZ8pCyJKM4ZodYS9gUQJ3Ds 6r6pJVDdYmgYOXBHYdu2eyq5uITiTG5lE+dWHTPKf/TWuwzEd2yFIFn/m ONm9vdT1sgTggDXmuyR2KNgI/Ju4QXxkSrfhSRM096/zF1QsAsij6em6w LEkNPVuVVIabnNNtVnFT/77il7Fn2GZL7JdMpG+SfRXjqpjetgL9BI0yM Ul9c3R/SyZ9OC/wWjbc2i7XTmhpxS9CxlprD6kI7LFk9zR0c9pvzySVQ1 N6nFyY//rjvXkMbNq4R5ohO5pWPo5VYUuY+TLJG8p8UhWVEBqpj9FdvbF A==; X-IronPort-AV: E=McAfee;i="6200,9189,10308"; a="240879261" X-IronPort-AV: E=Sophos;i="5.90,239,1643702400"; d="scan'208";a="240879261" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2022 21:17:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,239,1643702400"; d="scan'208";a="790198741" Received: from unknown (HELO localhost.localdomain) ([10.23.185.145]) by fmsmga006.fm.intel.com with ESMTP; 05 Apr 2022 21:17:01 -0700 Message-ID: Subject: Re: [PATCH 05/11] i2c: ismt: Fix undefined behavior due to shift overflowing the constant From: Seth Heasley To: Borislav Petkov , LKML Cc: Neil Horman , Wolfram Sang , linux-i2c@vger.kernel.org, seth.heasley@intel.com Date: Tue, 05 Apr 2022 14:18:21 -0700 In-Reply-To: <20220405151517.29753-6-bp@alien8.de> References: <20220405151517.29753-1-bp@alien8.de> <20220405151517.29753-6-bp@alien8.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5 (3.28.5-8.el7) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org On Tue, 2022-04-05 at 17:15 +0200, Borislav Petkov wrote: > From: Borislav Petkov > > Fix: > > drivers/i2c/busses/i2c-ismt.c: In function ‘ismt_hw_init’: > drivers/i2c/busses/i2c-ismt.c:770:2: error: case label does not > reduce to an integer constant > case ISMT_SPGT_SPD_400K: > ^~~~ > drivers/i2c/busses/i2c-ismt.c:773:2: error: case label does not > reduce to an integer constant > case ISMT_SPGT_SPD_1M: > ^~~~ > > See https://lore.kernel.org/r/YkwQ6%2BtIH8GQpuct@zn.tnic for the gory > details as to why it triggers with older gccs only. > > Signed-off-by: Borislav Petkov Reviewed-by: Seth Heasley > Cc: Seth Heasley > Cc: Neil Horman > Cc: Wolfram Sang > Cc: linux-i2c@vger.kernel.org > --- > drivers/i2c/busses/i2c-ismt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c- > ismt.c > index f4820fd3dc13..c0364314877e 100644 > --- a/drivers/i2c/busses/i2c-ismt.c > +++ b/drivers/i2c/busses/i2c-ismt.c > @@ -145,8 +145,8 @@ > #define ISMT_SPGT_SPD_MASK 0xc0000000 /* SMBus Speed mask > */ > #define ISMT_SPGT_SPD_80K 0x00 /* 80 kHz */ > #define ISMT_SPGT_SPD_100K (0x1 << 30) /* 100 kHz */ > -#define ISMT_SPGT_SPD_400K (0x2 << 30) /* 400 kHz */ > -#define ISMT_SPGT_SPD_1M (0x3 << 30) /* 1 MHz */ > +#define ISMT_SPGT_SPD_400K (0x2U << 30) /* 400 kHz */ > +#define ISMT_SPGT_SPD_1M (0x3U << 30) /* 1 MHz */ > > > /* MSI Control Register (MSICTL) bit definitions */