From patchwork Wed Sep 6 13:38:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 111777 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp889681qge; Wed, 6 Sep 2017 06:40:04 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5UmR4zu2TEQnC6RckbZ/LNKQy5Hek5tGmv4qRvRbBPHhBrv+c4hDGof/x+OBumDtTiXoTA X-Received: by 10.98.87.219 with SMTP id i88mr7169833pfj.81.1504705204489; Wed, 06 Sep 2017 06:40:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504705204; cv=none; d=google.com; s=arc-20160816; b=AcvmNUi62acbU4pUZ9EIXPU5MQq9rTI+FeQOzGL8T03nJKgdqFDui6E/lR+6Khw6Z5 VRQkAtkoa2Mzox8ZrB3KMg8Y/swUUfdV/ZJtbh6a1gfsFdbuhHm0+Eiygx+mHEcrxad9 D+0HnD5jZnYerpAfti7leO94nWoFU8VEDHfE120B+ejOKYFKiGSXZXpOiyAs2PxD3RyT 8cN/T6BmKiCToDJQVrxuMACf0sxWoARb9H2yYqK9XymRP6Y5Bv1TuJLM8Q3l4KLUU7Aq RY/5XSFKVzCVHQP0BinqeUUmqYRUjDn5EkzGYEvAY2/cyiW3OiaR1p1fyAk0fRSvfiNN Vlfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=EkasVy5nZ8Hx6cE3u7LrhhBNEp+Va0qlJ7JFtp40ZQo=; b=tGUdJy9+xbCPUfnxD2/t5RhmYsS25NEd+b6idulAUpJHaJrZ9C6im63WhyAWTJISum /vhI3eBskoCefLBJ3iLq8+2wmTMb+nOk/Vu3IJoZvibAC8VJeJJOreh29AxPUyaOrVW4 0JHq/GLsC/JhpN93YgtaH5xhUNhbFlm/ZVN3hYtV/nzsbseXPu/OlptFRqqC69VC52wK L/Eij1OY2nTSmP+YlPjF7qLZsgxXHp1mkfUmLUXuMGZA3PstqzlrAPynlFnt9sJpeFPM Dh0lrVXlSampsRbywPe4hYajlUDBif576p0X/b07/ZOMvufzDbkQvwsCqM8M77ePDcWO cItw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t61si1302586plb.199.2017.09.06.06.40.04; Wed, 06 Sep 2017 06:40:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932141AbdIFNkB (ORCPT + 26 others); Wed, 6 Sep 2017 09:40:01 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60845 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753034AbdIFNj6 (ORCPT ); Wed, 6 Sep 2017 09:39:58 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0MRDAN-1du9gO0FPb-00Ud7z; Wed, 06 Sep 2017 15:39:35 +0200 From: Arnd Bergmann To: Karsten Keil Cc: Arnd Bergmann , Joe Perches , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] isdn: isdnloop: fix logic error in isdnloop_sendbuf Date: Wed, 6 Sep 2017 15:38:58 +0200 Message-Id: <20170906133928.3152020-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:raM9FXQN9EybXU5q5y1SPfvmcHZ/mCn3F0G45FzBcBcRLKsa2Xo BHOPAt+DQq1BOO76LaGipAEQf23WQ2emtTlO0Mnqesbs8Os7HsiJbQPLExWJQqjSuDe/8jd W4GSwg62TK/OybiVxjOV0dVDfTZSux5HZORc+FN0NN+B6VhYoqKGLfrylmRGlughO5XW2kH pBEXWVvmIxUes+sP8CXlw== X-UI-Out-Filterresults: notjunk:1; V01:K0:9WTjgjyP7Ps=:rvq73VEns7/4Q5I8CPZa15 f6POZMY/Vwa7P30BTlzNl1YfuoURDB9+yBOnr+97/4KZpppnDQjK0Jte09wK7B7XPJwTCiUp3 vO+371OTQts+mT87ZZbVM0zCkrhAZq+BiribyU6RjdeHs68KnRC8FnqNrVOLOg86WjN5nMC40 c0/LW6by9KPGpo58GIkm2w7xfWiriz3YWILqiVvhYCZ8b/QNzxCxfaSCBzk11wDT8HcXivJ63 tl4ll/sgkVEiAvkAJBSxfkcupRqSd7n40/s7TsZFKfJyaNMXWhC/7njrjUYxj03wfJd47uvJB n1TGYYJAQZ73HOOEhmoe9tvI4Uuxdz6GipOEB1EkKSoU/IKbmkCYGAWkGWbeKSmm+IKi/o+v2 YA/NO3grSRlAgr+blfRnqL1k0ohUOwgUpxM/3wgqomnd5q8Ohll0okB1UMsvul0KvySt6c3AK XExZ4tWKQXBeF0u/4My34HRaXd6nZeHu+XYIzg3NgGZ68HFq5aC3oMYi+1PYK4RTn0PjxELzq cCHcT5Fba3o5rsGedNG5c5O7Wia5D+FlDJIiluLfYlrCvr6UPA5vysOTh7NUdofgAyX8MsELo yhJTSR1b+w7liuWCnOYPxLXKUeYxPCP80btwzS1iSzyXq38qSq6FSQ5R6U+vsggZewpIH3cCn ykQtRF2PNYrF84oSut4JoHzxPdXLsydabwk8f9WhUJYgYhl03buHQwLgIuQUebXQFydI2tazb ajN61+OmRFQP0xUBj9dlO0ZUltaovg+MbBBv7w== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 found an ancient bug in the loop driver, leading to a condition that is always false, meaning we ignore the contents of 'card->flags' here: drivers/isdn/isdnloop/isdnloop.c:412:37: error: ?: using integer constants in boolean context, the expression will always evaluate to 'true' [-Werror=int-in-bool-context] This changes the braces in the expression to ensure we actually compare the flag bits, rather than comparing a constant. As Joe Perches pointed out, an earlier patch of mine incorrectly assumed this was a false-positive warning. Cc: Joe Perches Link: https://patchwork.kernel.org/patch/9840289/ Signed-off-by: Arnd Bergmann --- drivers/isdn/isdnloop/isdnloop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c index 6ffd13466b8c..e97232646ba1 100644 --- a/drivers/isdn/isdnloop/isdnloop.c +++ b/drivers/isdn/isdnloop/isdnloop.c @@ -409,7 +409,7 @@ isdnloop_sendbuf(int channel, struct sk_buff *skb, isdnloop_card *card) return -EINVAL; } if (len) { - if (!(card->flags & (channel) ? ISDNLOOP_FLAGS_B2ACTIVE : ISDNLOOP_FLAGS_B1ACTIVE)) + if (!(card->flags & (channel ? ISDNLOOP_FLAGS_B2ACTIVE : ISDNLOOP_FLAGS_B1ACTIVE))) return 0; if (card->sndcount[channel] > ISDNLOOP_MAX_SQUEUE) return 0;