Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2142807iof; Tue, 7 Jun 2022 21:10:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbzWujULpi7Xvg6bf3cVF++W2WBxFtSVmIEUVglCftos89syK9iWQweC+M3HM3d9BWP0If X-Received: by 2002:a17:90b:4b51:b0:1e8:71cb:4d18 with SMTP id mi17-20020a17090b4b5100b001e871cb4d18mr18134248pjb.108.1654661444502; Tue, 07 Jun 2022 21:10:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654661444; cv=none; d=google.com; s=arc-20160816; b=Ih4sA22kmp0Cl8nrNn+G5WTQ5PlnGJWpOOgYD/7koSchxP+jTN0pRJd1/yQBi+4S4y nQuHkljwNUAQY9n5LqmyjPPIwokohCH442I4FMSl5ET+WW6iKhM2222WcSnvbnuv1QF8 Lb9tiAAXv4TJwpnBcosaP6H4DX6ch9F/CEz70O1yZQD0whPLIurpDn723fs+XXa5fu2e IywlK6lHEX3MuucA0UEbqBQK7j4dzNhuQ9f660Y5ceOQ65dG4J3mbHljbr+jN2Agdw3y kNzfGO58TFfVEnQp8ixmEbPXTtfnMzmZRZDVopUvswA3xZZjIaWJJxHrMkJZ2FHPe7hw +8pA== 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=ned2sZ5K4C/9vacNzpZyH3RMl+anlfRkdsD3p5iqsOk=; b=ugwD42d7W6xkAfQjQ5icQfyxrs48ogc8zxsUhR8SQl8ql0J3NPS1Kn8sXz+h6FAAO5 RnC2/eem95Bjxmy0CqPLNIf8F86le2YuFn/i9uw6Z7YCI0Qwlowd2VeuaYofI/RNJ5NF WN5JQIWbc6jy4YWrJwHENkI3AkICCM24qHqD4hpuTKs8qsncJTwxsycv3FIKnIGyfjBB aYXuEZF9OKUFNBzaZHMqDIevRvAIX6YbZF9SfQ+WKo6pa9FhZBYWv4vuZOElvV5i1yKS ADD324GoBfxkkYy32uLcEG9ISyXaLDc/HMKZ1AKzSHvAemNsM/hag+yQOsOuCXunGJx7 wtlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=crnfDhmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id ip4-20020a17090b314400b001e82bdf4718si21747045pjb.3.2022.06.07.21.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 21:10:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=crnfDhmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0F9D0229636; Tue, 7 Jun 2022 20:42:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383280AbiFGWkV (ORCPT + 99 others); Tue, 7 Jun 2022 18:40:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380147AbiFGV01 (ORCPT ); Tue, 7 Jun 2022 17:26:27 -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 2F44922872B; Tue, 7 Jun 2022 12:01:53 -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 11EDF617E1; Tue, 7 Jun 2022 19:01:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DBE4C34115; Tue, 7 Jun 2022 19:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654628512; bh=w+MagUlKTRVQeduCnzXsbmwB37LA3qchQOIHBHtTyP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=crnfDhmT7LwRNDrDw6mCwsUIvQkBk8YUc66LHGmEbxJys9S6bIZ4vQU9wNsNEEMEp SZVkT9Rwt6MLsARCEnQNy5bJNTPbVWIHQMlXSVUmPEkLMH+1aVT0iCCLAq5KxjL7dn cvwyKhaOA8yHKcGPRMB0aJWDixOQ7zFh5EJzZsUg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mike Christie , Lee Duncan , Dan Carpenter , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.18 355/879] scsi: iscsi: Fix harmless double shift bug Date: Tue, 7 Jun 2022 18:57:53 +0200 Message-Id: <20220607165013.167730718@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@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=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: Dan Carpenter [ Upstream commit 565138ac5f8a5330669a20e5f94759764e9165ec ] These flags are supposed to be bit numbers. Right now they cause a double shift bug where we use BIT(BIT(2)) instead of BIT(2). Fortunately, the bit numbers are small and it's done consistently so it does not cause an issue at run time. Link: https://lore.kernel.org/r/YmFyWHf8nrrx+SHa@kili Fixes: 5bd856256f8c ("scsi: iscsi: Merge suspend fields") Reviewed-by: Mike Christie Reviewed-by: Lee Duncan Signed-off-by: Dan Carpenter Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- include/scsi/libiscsi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index d0a24779c52d..c0703cd20a99 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -54,9 +54,9 @@ enum { #define ISID_SIZE 6 /* Connection flags */ -#define ISCSI_CONN_FLAG_SUSPEND_TX BIT(0) -#define ISCSI_CONN_FLAG_SUSPEND_RX BIT(1) -#define ISCSI_CONN_FLAG_BOUND BIT(2) +#define ISCSI_CONN_FLAG_SUSPEND_TX 0 +#define ISCSI_CONN_FLAG_SUSPEND_RX 1 +#define ISCSI_CONN_FLAG_BOUND 2 #define ISCSI_ITT_MASK 0x1fff #define ISCSI_TOTAL_CMDS_MAX 4096 -- 2.35.1