From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BD825A10DA for ; Fri, 2 Aug 2019 02:05:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC4AA1C1BD; Fri, 2 Aug 2019 02:05:45 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130089.outbound.protection.outlook.com [40.107.13.89]) by dpdk.org (Postfix) with ESMTP id 7BAD91C1BD for ; Fri, 2 Aug 2019 02:05:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lx2ZRF2C0Hzr9qtguwCAFzXv3h+DUP14X/8UZoN7IGXukDUBb8b+nR78DiRmwhgQhM2JK7gkQn0r83Gpk34PlvYpegLdny1FhzUCttpoin/+gEYHucEfZmDGNGBdPvt3y2cHRcC1Z6CeuEKydQQ4fDoT/JCy/GMXZefcmXeO5xvez4hbbN5rlwMiY3UrJiQilDs4R/l/EvFDIluHnGSxE21HsUTBigxRvETXSeQ/MW6XeShU4V6Wy04z7HemcjAKnMYUBCkoB40JlbupWQobQKUrz7b+fOsCysDdJbT49ORbR7S8yk3ZLU7ruo7Jx0hVkn9t3FcBGoXnkoiRoJmZ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q0c5uhhyUaQW30tfuUT+RXs5iT+/XRcX43JRmoaE4qg=; b=FRuuAyvzln1WNZmH0zlyC8FN3icHxBE/u7RKJhI7HRNwRb9yE/q8IZ9Sp5sIPogRwr2tXYWfgsvY6MyySICs82pryUcQSakfGPV8mxt4llBgZBz5O614G3mccnvaAa8owC8JCKDAzJysgaEiFOCOldMffwmDLQdCCoFxQv9WdTlN68mwZQTMcB2qBPQJvWsEeA8AIK/LsFqgXp5Q36r4iUdiA1Ob0lglcNGoWFIZVjskgDtgYyDT/6DwaMRqziJlw/Ea2I0AdEnYZkYeRCBhjA7Gl4l7+aR5Mc5J6v4Ts7GemKYVELMQPjOX653NLY5ngiD3U7l1RGoqdcQ/bnyV2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=mellanox.com;dmarc=pass action=none header.from=mellanox.com;dkim=pass header.d=mellanox.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q0c5uhhyUaQW30tfuUT+RXs5iT+/XRcX43JRmoaE4qg=; b=X7lLE1ys2HXGuKdHzq/vHFazGoJ1mobQaZ45ptHn9ULzfZV7uNIAo1Aun5UJ8WiDr7AmeilUDYn7yZ7QKB+mRaoEOovysyhqwxkk3pR/TmKGyWvjAZ4CyCPYzRUCxfSx1KtoW9TGwht7RVjzFit0C4FuxFyNt7MTpZBGJ4F2NAQ= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4089.eurprd05.prod.outlook.com (52.134.68.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.15; Fri, 2 Aug 2019 00:05:43 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::589a:a9d4:5426:d194]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::589a:a9d4:5426:d194%6]) with mapi id 15.20.2136.010; Fri, 2 Aug 2019 00:05:43 +0000 From: Yongseok Koh To: Andrius Sirvys CC: "stable@dpdk.org" Thread-Topic: [dpdk-stable] [17.11] drivers/net: fix shifting 32-bit signed variable 31 times Thread-Index: AQHVQswOAUVwjMOqf0m0HcuF7p6VkKbnBnQA Date: Fri, 2 Aug 2019 00:05:43 +0000 Message-ID: References: <20190725093342.5290-1-andrius.sirvys@intel.com> In-Reply-To: <20190725093342.5290-1-andrius.sirvys@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: c2228248-604b-4ed8-c73f-08d716dd297e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB3PR0502MB4089; x-ms-traffictypediagnostic: DB3PR0502MB4089: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6108; x-forefront-prvs: 011787B9DD x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(39860400002)(366004)(376002)(346002)(396003)(199004)(189003)(6506007)(66556008)(76176011)(66476007)(66446008)(64756008)(478600001)(305945005)(102836004)(6512007)(66946007)(4326008)(53546011)(26005)(76116006)(91956017)(316002)(11346002)(446003)(68736007)(36756003)(6246003)(66066001)(86362001)(186003)(71190400001)(71200400001)(14454004)(81166006)(6916009)(6436002)(486006)(33656002)(5660300002)(14444005)(6486002)(7736002)(81156014)(229853002)(25786009)(2906002)(2616005)(476003)(99286004)(6116002)(3846002)(53936002)(8936002)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4089; H:DB3PR0502MB3980.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6etuKvcwDmJKUhWPbZIyuO590t9ZJ7iv95zXJk3Jvj4OdaX8FqRQhCcfPmzikFkgyV2nHj9t9i0TgytEawiMakgWro+GdDxqWxO7rhgtBgXQTxEqsAwWqxoTFtBXl3//QqS3M97AhkfnDZgv83vqGh4UJ5Qpt5Gt8RJpNqLrB41ADiE//4EbjwSJbX9G/s0jVAfvRYIRfS102cmT7Z7cOvNUOXATeQHTaUs0jCDp981wR+78kBpZ4uRoYTaaZ/iQWo6s2aavvPYA2x01mbA7zDCjwaQEI3LdTHdHXnIXw+CsM2Ij+xnyKx13A9tuAMLiFqJCjVew0tOwojhcnb0HOdYla7Hq+t56XQISb3h3n0Frvv+LQmtKGUqFvbQPlhuNwu/6k8hgcq8EkAcLmbFMWRfPABt8x9h5+RpZBJEt/20= Content-Type: text/plain; charset="us-ascii" Content-ID: <83974B0330F7C445860643D7631F9B54@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2228248-604b-4ed8-c73f-08d716dd297e X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Aug 2019 00:05:43.4733 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: yskoh@mellanox.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4089 Subject: Re: [dpdk-stable] [17.11] drivers/net: fix shifting 32-bit signed variable 31 times X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" > On Jul 25, 2019, at 2:33 AM, Andrius Sirvys wr= ote: >=20 > [ backported from upstream commit 902f389f9b4cad1feba320e8b779432eeb76cad= a ] >=20 > Shifting signed 32-bit values by 31-bits has the potential for > unexpected outcomes as compiler can overwrite a bit. > Specified that values are unsigned. >=20 > Errors are observed from running cppcheck. >=20 > Bugzilla ID: 58 > Fixes: b5bf7719221d ("bnx2x: driver support routines") > Fixes: bdb244b96920 ("e1000: whitespace changes") > Fixes: 5a32a257f957 ("e1000: more NICs in base driver") > Fixes: 2fe669f4bcd2 ("net/nfp: support MAC address change") > Fixes: defb9a5dd156 ("nfp: introduce driver initialization") > Fixes: ec94dbc57362 ("qede: add base driver") > Fixes: d2e7d931d0ad ("net/qede/base: formatting changes") > Cc: stable@dpdk.org >=20 > Signed-off-by: Andrius Sirvys >=20 > --- applied to stable/17.11 thanks, >=20 > Cc: ravi1.kumar@amd.com > Cc: stephen@networkplumber.org > Cc: alejandro.lucero@netronome.com > Cc: rasesh.mody@qlogic.com > --- > drivers/net/bnx2x/ecore_hsi.h | 2 +- > drivers/net/bnx2x/ecore_reg.h | 2 +- > drivers/net/bnx2x/elink.h | 2 +- > drivers/net/e1000/base/e1000_82575.h | 4 ++-- > drivers/net/e1000/base/e1000_ich8lan.c | 2 +- > drivers/net/nfp/nfp_net_ctrl.h | 2 +- > drivers/net/qede/base/common_hsi.h | 4 ++-- > drivers/net/qede/base/ecore_hsi_common.h | 2 +- > drivers/net/qede/base/ecore_hsi_eth.h | 2 +- > drivers/net/qede/base/ecore_hw_defs.h | 2 +- > 10 files changed, 12 insertions(+), 12 deletions(-) >=20 > diff --git a/drivers/net/bnx2x/ecore_hsi.h b/drivers/net/bnx2x/ecore_hsi.= h > index 5cce66474..e7878c0e4 100644 > --- a/drivers/net/bnx2x/ecore_hsi.h > +++ b/drivers/net/bnx2x/ecore_hsi.h > @@ -3529,7 +3529,7 @@ struct igu_regular > #define IGU_REGULAR_CLEANUP_TYPE_SHIFT 28 > #define IGU_REGULAR_CLEANUP_SET (0x1<<30) /* BitField sb_id_and_flags */ > #define IGU_REGULAR_CLEANUP_SET_SHIFT 30 > -#define IGU_REGULAR_BCLEANUP (0x1<<31) /* BitField sb_id_and_flags */ > +#define IGU_REGULAR_BCLEANUP (0x1U<<31) /* BitField sb_id_and_flags */ > #define IGU_REGULAR_BCLEANUP_SHIFT 31 > uint32_t reserved_2; > }; > diff --git a/drivers/net/bnx2x/ecore_reg.h b/drivers/net/bnx2x/ecore_reg.= h > index 33cea4eb9..e2bdc8bd7 100644 > --- a/drivers/net/bnx2x/ecore_reg.h > +++ b/drivers/net/bnx2x/ecore_reg.h > @@ -1983,7 +1983,7 @@ > #define AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR (0x1<<5) > #define AEU_INPUTS_ATTN_BITS_BRB_HW_INTERRUPT (0x1<<19) > #define AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR (0x1<<18) > -#define AEU_INPUTS_ATTN_BITS_CCM_HW_INTERRUPT (0x1<<31) > +#define AEU_INPUTS_ATTN_BITS_CCM_HW_INTERRUPT (0x1U<<31) > #define AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR (0x1<<30) > #define AEU_INPUTS_ATTN_BITS_CDU_HW_INTERRUPT (0x1<<9) > #define AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR (0x1<<8) > diff --git a/drivers/net/bnx2x/elink.h b/drivers/net/bnx2x/elink.h > index 9401b7cd5..cae354b92 100644 > --- a/drivers/net/bnx2x/elink.h > +++ b/drivers/net/bnx2x/elink.h > @@ -396,7 +396,7 @@ struct elink_params { > #define ELINK_EEE_MODE_OUTPUT_TIME (1<<28) > #define ELINK_EEE_MODE_OVERRIDE_NVRAM (1<<29) > #define ELINK_EEE_MODE_ENABLE_LPI (1<<30) > -#define ELINK_EEE_MODE_ADV_LPI (1<<31) > +#define ELINK_EEE_MODE_ADV_LPI (1U<<31) >=20 > uint16_t hw_led_mode; /* part of the hw_config read from the shmem */ > uint32_t multi_phy_config; > diff --git a/drivers/net/e1000/base/e1000_82575.h b/drivers/net/e1000/bas= e/e1000_82575.h > index 4133cdd82..6f2b22c13 100644 > --- a/drivers/net/e1000/base/e1000_82575.h > +++ b/drivers/net/e1000/base/e1000_82575.h > @@ -383,7 +383,7 @@ struct e1000_adv_tx_context_desc { > #define E1000_ETQF_FILTER_ENABLE (1 << 26) > #define E1000_ETQF_IMM_INT (1 << 29) > #define E1000_ETQF_1588 (1 << 30) > -#define E1000_ETQF_QUEUE_ENABLE (1 << 31) > +#define E1000_ETQF_QUEUE_ENABLE (1U << 31) > /* > * ETQF filter list: one static filter per filter consumer. This is > * to avoid filter collisions later. Add new filters > @@ -410,7 +410,7 @@ struct e1000_adv_tx_context_desc { > #define E1000_DTXSWC_LLE_MASK 0x00FF0000 /* Per VF Local LB enables */ > #define E1000_DTXSWC_VLAN_SPOOF_SHIFT 8 > #define E1000_DTXSWC_LLE_SHIFT 16 > -#define E1000_DTXSWC_VMDQ_LOOPBACK_EN (1 << 31) /* global VF LB enable = */ > +#define E1000_DTXSWC_VMDQ_LOOPBACK_EN (1U << 31) /* global VF LB enable= */ >=20 > /* Easy defines for setting default pool, would normally be left a zero *= / > #define E1000_VT_CTL_DEFAULT_POOL_SHIFT 7 > diff --git a/drivers/net/e1000/base/e1000_ich8lan.c b/drivers/net/e1000/b= ase/e1000_ich8lan.c > index 6dd046d2f..5475a69d8 100644 > --- a/drivers/net/e1000/base/e1000_ich8lan.c > +++ b/drivers/net/e1000/base/e1000_ich8lan.c > @@ -5166,7 +5166,7 @@ STATIC void e1000_initialize_hw_bits_ich8lan(struct= e1000_hw *hw) > /* Device Status */ > if (hw->mac.type =3D=3D e1000_ich8lan) { > reg =3D E1000_READ_REG(hw, E1000_STATUS); > - reg &=3D ~(1 << 31); > + reg &=3D ~(1U << 31); > E1000_WRITE_REG(hw, E1000_STATUS, reg); > } >=20 > diff --git a/drivers/net/nfp/nfp_net_ctrl.h b/drivers/net/nfp/nfp_net_ctr= l.h > index 1ebd99caf..b7f98e3cf 100644 > --- a/drivers/net/nfp/nfp_net_ctrl.h > +++ b/drivers/net/nfp/nfp_net_ctrl.h > @@ -131,7 +131,7 @@ > #define NFP_NET_CFG_UPDATE_RESET (0x1 << 7) /* Update due to FL= R */ > #define NFP_NET_CFG_UPDATE_IRQMOD (0x1 << 8) /* IRQ mod change *= / > #define NFP_NET_CFG_UPDATE_VXLAN (0x1 << 9) /* VXLAN port chang= e */ > -#define NFP_NET_CFG_UPDATE_ERR (0x1 << 31) /* A error occurre= d */ > +#define NFP_NET_CFG_UPDATE_ERR (0x1U << 31) /* A error occurr= ed */ > #define NFP_NET_CFG_TXRS_ENABLE 0x0008 > #define NFP_NET_CFG_RXRS_ENABLE 0x0010 > #define NFP_NET_CFG_MTU 0x0018 > diff --git a/drivers/net/qede/base/common_hsi.h b/drivers/net/qede/base/c= ommon_hsi.h > index 9a6059ac2..4dce5426d 100644 > --- a/drivers/net/qede/base/common_hsi.h > +++ b/drivers/net/qede/base/common_hsi.h > @@ -402,9 +402,9 @@ > #define QM_BYTE_CRD_REG_WIDTH 24 > #define QM_BYTE_CRD_REG_SIGN_BIT (1 << (QM_BYTE_CRD_REG_WIDTH - 1)) > #define QM_WFQ_CRD_REG_WIDTH 32 > -#define QM_WFQ_CRD_REG_SIGN_BIT (1 << (QM_WFQ_CRD_REG_WIDTH - 1)) > +#define QM_WFQ_CRD_REG_SIGN_BIT (1U << (QM_WFQ_CRD_REG_WIDTH - 1)) > #define QM_RL_CRD_REG_WIDTH 32 > -#define QM_RL_CRD_REG_SIGN_BIT (1 << (QM_RL_CRD_REG_WIDTH - 1)) > +#define QM_RL_CRD_REG_SIGN_BIT (1U << (QM_RL_CRD_REG_WIDTH - 1)) >=20 > /*****************/ > /* CAU CONSTANTS */ > diff --git a/drivers/net/qede/base/ecore_hsi_common.h b/drivers/net/qede/= base/ecore_hsi_common.h > index 31ae2a0fe..e499a5b4f 100644 > --- a/drivers/net/qede/base/ecore_hsi_common.h > +++ b/drivers/net/qede/base/ecore_hsi_common.h > @@ -2146,7 +2146,7 @@ struct igu_cleanup { > #define IGU_CLEANUP_CLEANUP_TYPE_MASK 0x7 > #define IGU_CLEANUP_CLEANUP_TYPE_SHIFT 28 > /* must always be set (use enum command_type_bit) */ > -#define IGU_CLEANUP_COMMAND_TYPE_MASK 0x1 > +#define IGU_CLEANUP_COMMAND_TYPE_MASK 0x1U > #define IGU_CLEANUP_COMMAND_TYPE_SHIFT 31 > __le32 reserved1; > }; > diff --git a/drivers/net/qede/base/ecore_hsi_eth.h b/drivers/net/qede/bas= e/ecore_hsi_eth.h > index ffbf5c712..1ddd99c27 100644 > --- a/drivers/net/qede/base/ecore_hsi_eth.h > +++ b/drivers/net/qede/base/ecore_hsi_eth.h > @@ -2368,7 +2368,7 @@ struct gft_ram_line { > #define GFT_RAM_LINE_TCP_FLAG_NS_SHIFT 29 > #define GFT_RAM_LINE_DST_PORT_MASK 0x1 > #define GFT_RAM_LINE_DST_PORT_SHIFT 30 > -#define GFT_RAM_LINE_SRC_PORT_MASK 0x1 > +#define GFT_RAM_LINE_SRC_PORT_MASK 0x1U > #define GFT_RAM_LINE_SRC_PORT_SHIFT 31 > __le32 hi; > #define GFT_RAM_LINE_DSCP_MASK 0x1 > diff --git a/drivers/net/qede/base/ecore_hw_defs.h b/drivers/net/qede/bas= e/ecore_hw_defs.h > index 4456af437..d189712e4 100644 > --- a/drivers/net/qede/base/ecore_hw_defs.h > +++ b/drivers/net/qede/base/ecore_hw_defs.h > @@ -53,7 +53,7 @@ struct igu_ctrl_reg { > #define IGU_CTRL_REG_PXP_ADDR_SHIFT 16 > #define IGU_CTRL_REG_RESERVED_MASK 0x1 > #define IGU_CTRL_REG_RESERVED_SHIFT 28 > -#define IGU_CTRL_REG_TYPE_MASK 0x1 /* use enum igu_ctrl_cmd */ > +#define IGU_CTRL_REG_TYPE_MASK 0x1U /* use enum igu_ctrl_cmd */ > #define IGU_CTRL_REG_TYPE_SHIFT 31 > }; >=20 > --=20 > 2.17.1 >=20