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 X-Spam-Level: X-Spam-Status: No, score=-10.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9EA2C4727F for ; Tue, 29 Sep 2020 11:08:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7AC4221EF for ; Tue, 29 Sep 2020 11:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377690; bh=O+S3gXpeUALOnnCTKavj7ZJ1s21FODA2ONq/k+opL18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=glvcNLWly7twDrN3YY0csMBArM42WfkPJXx2iz3nquWpdafYvwQKyCZxDA7TIleMp 9/UsPfuf94SmaNOIFSPKe9z7tgiWMgE4XxY1XL9opDCtxb0rQamm2UbziTvTfPiwtS ATkTeNytkpfUUE7zmDK4RxcVuQV+XRm/uCdEHoNQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728599AbgI2LHb (ORCPT ); Tue, 29 Sep 2020 07:07:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:45900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728912AbgI2LHX (ORCPT ); Tue, 29 Sep 2020 07:07:23 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 18992221E7; Tue, 29 Sep 2020 11:07:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377642; bh=O+S3gXpeUALOnnCTKavj7ZJ1s21FODA2ONq/k+opL18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GqgEMIlPKQ31og68BMaohvhKkK0fNWxuHJnFw6A4WNxBk7thpqt5evbajzQa2/6aj ciuMzxXmM0d7bWlh5m5WACQQ1Y3O1fsz6LvmEQdJf3tvAATIXioU5aiS6D4ynFcyhr 6oJwKawIzb11qpW4TP6Okdh3okIUuYLn0mjgn5cY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings , Boris Brezillon , "Nobuhiro Iwamatsu (CIP)" , Sasha Levin Subject: [PATCH 4.9 005/121] mtd: Fix comparison in map_word_andequal() Date: Tue, 29 Sep 2020 12:59:09 +0200 Message-Id: <20200929105930.457604144@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105930.172747117@linuxfoundation.org> References: <20200929105930.172747117@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ben Hutchings commit ea739a287f4f16d6250bea779a1026ead79695f2 upstream. Commit 9e343e87d2c4 ("mtd: cfi: convert inline functions to macros") changed map_word_andequal() into a macro, but also changed the right hand side of the comparison from val3 to val2. Change it back to use val3 on the right hand side. Thankfully this did not cause a regression because all callers currently pass the same argument for val2 and val3. Fixes: 9e343e87d2c4 ("mtd: cfi: convert inline functions to macros") Signed-off-by: Ben Hutchings Signed-off-by: Boris Brezillon Signed-off-by: Nobuhiro Iwamatsu (CIP) Signed-off-by: Sasha Levin --- include/linux/mtd/map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h @@ -312,7 +312,7 @@ void map_destroy(struct mtd_info *mtd); ({ \ int i, ret = 1; \ for (i = 0; i < map_words(map); i++) { \ - if (((val1).x[i] & (val2).x[i]) != (val2).x[i]) { \ + if (((val1).x[i] & (val2).x[i]) != (val3).x[i]) { \ ret = 0; \ break; \ } \