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=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 37DD5C43381 for ; Fri, 22 Mar 2019 14:03:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7CA5218A5 for ; Fri, 22 Mar 2019 14:03:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ericsson.com header.i=@ericsson.com header.b="SSZvJtsj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727916AbfCVODy (ORCPT ); Fri, 22 Mar 2019 10:03:54 -0400 Received: from sesbmg23.ericsson.net ([193.180.251.37]:49502 "EHLO sesbmg23.ericsson.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727725AbfCVODy (ORCPT ); Fri, 22 Mar 2019 10:03:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; d=ericsson.com; s=mailgw201801; c=relaxed/relaxed; q=dns/txt; i=@ericsson.com; t=1553263432; x=1555855432; h=From:Sender:Reply-To:Subject:Date:Message-ID:To:CC:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=eZViI7gtSuEG6/0TRyFOUzk92xPCL2bgcjnbjrGwrbc=; b=SSZvJtsjNJ30XZ4EElvr5jzANiO0eNURg+VhMJheFgX0XMH6uIIJplX3sMb0hl3u Vm9l8vDesqFbZXrzCsEmJC2XACy9AeiPNPq6stF7emRYdt14L9wzsz29A4c37xk9 Qrh9u9YbqWVArsBviboP5kGHaK1R3Ui/Yi/oCq2zv94=; X-AuditID: c1b4fb25-259ff7000000438b-22-5c94eb4860f4 Received: from ESESSMB502.ericsson.se (Unknown_Domain [153.88.183.120]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id 13.A9.17291.84BE49C5; Fri, 22 Mar 2019 15:03:52 +0100 (CET) Received: from ESESSMR505.ericsson.se (153.88.183.127) by ESESSMB502.ericsson.se (153.88.183.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 22 Mar 2019 15:03:51 +0100 Received: from ESESBMB502.ericsson.se (153.88.183.169) by ESESSMR505.ericsson.se (153.88.183.127) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 22 Mar 2019 15:03:51 +0100 Received: from tipsy.lab.linux.ericsson.se (153.88.183.153) by smtp.internal.ericsson.com (153.88.183.185) with Microsoft SMTP Server id 15.1.1713.5 via Frontend Transport; Fri, 22 Mar 2019 15:03:51 +0100 From: Jon Maloy To: , CC: , , , , , , Subject: [net 1/1] tipc: tipc clang warning Date: Fri, 22 Mar 2019 15:03:51 +0100 Message-ID: <1553263431-22966-1-git-send-email-jon.maloy@ericsson.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOLMWRmVeSWpSXmKPExsUyM2J7ha7H6ykxBsce8FrcaOhhtphzvoXF YsXuSawWb1/NYrc4tkDMYsv5LIsr7WfZLR5fv87swOGxZeVNJo93V9g8di/4zOTxeZOcx/ot W5kCWKO4bFJSczLLUov07RK4MrbdWcdScFyg4vvvRYwNjC95uxg5OSQETCQ+fFnCAmILCRxh lDgxOa6LkQvI/sYo8fbrCmY45+HCViYI5wKjRN/tnewgLWwCGhIvp3UwgtgiAsYSr1Z2ghUx CzxmlPhyfxUbSEJYQEdi4c15QDYHB4uAqsSF13wgYV4BN4nGC8sYIc6Qkzh//CczxBnKEnM/ TGOCqBGUODnzCdh5zAISEgdfvGCewMg/C0lqFpLUAkamVYyixanFSbnpRsZ6qUWZycXF+Xl6 eaklmxiBwXtwy2/VHYyX3zgeYhTgYFTi4b1+b0qMEGtiWXFl7iFGCQ5mJRHeXdGTY4R4UxIr q1KL8uOLSnNSiw8xSnOwKInz/hESjBESSE8sSc1OTS1ILYLJMnFwSjUwqtgvdf3TdyBs5om1 Sc3L/Cozeqq+anzgc/H90LZKp1Tiu/HS69J5ppY/T7FKrJeSrL/R23/R90H7i5+dlSE3XZYc YfSa8OLwYW+TTWaeboxFmuEq78/zzLBZ0WbXLBHMef30ylofvjiTDysWBBwWLvJS4Dp4efci t1sbUgX9Oe4aGWmtOpWlxFKckWioxVxUnAgA5W9miVoCAAA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When checking the code with clang -Wsometimes-uninitialized we get the following warning: if (!tipc_link_is_establishing(l)) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ net/tipc/node.c:847:46: note: uninitialized use occurs here tipc_bearer_xmit(n->net, bearer_id, &xmitq, maddr); net/tipc/node.c:831:2: note: remove the 'if' if its condition is always true if (!tipc_link_is_establishing(l)) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ net/tipc/node.c:821:31: note: initialize the variable 'maddr' to silence this warning struct tipc_media_addr *maddr; We fix this by initializing 'maddr' to NULL. For the matter of clarity, we also test if 'xmitq' is non-empty before we use it and 'maddr' further down in the function. It will never happen that 'xmitq' is non- empty at the same time as 'maddr' is NULL, so this is a sufficient test. Fixes: 598411d70f85 ("tipc: make resetting of links non-atomic") Reported-by: Nathan Chancellor Signed-off-by: Jon Maloy --- net/tipc/node.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/tipc/node.c b/net/tipc/node.c index 2dc4919..dd3b6dc 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -817,10 +817,10 @@ static void __tipc_node_link_down(struct tipc_node *n, int *bearer_id, static void tipc_node_link_down(struct tipc_node *n, int bearer_id, bool delete) { struct tipc_link_entry *le = &n->links[bearer_id]; + struct tipc_media_addr *maddr = NULL; struct tipc_link *l = le->link; - struct tipc_media_addr *maddr; - struct sk_buff_head xmitq; int old_bearer_id = bearer_id; + struct sk_buff_head xmitq; if (!l) return; @@ -844,7 +844,8 @@ static void tipc_node_link_down(struct tipc_node *n, int bearer_id, bool delete) tipc_node_write_unlock(n); if (delete) tipc_mon_remove_peer(n->net, n->addr, old_bearer_id); - tipc_bearer_xmit(n->net, bearer_id, &xmitq, maddr); + if (!skb_queue_empty(&xmitq)) + tipc_bearer_xmit(n->net, bearer_id, &xmitq, maddr); tipc_sk_rcv(n->net, &le->inputq); } -- 2.1.4