From patchwork Sat Aug 12 12:05:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 800903 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xV10Q2QKjz9t3C for ; Sat, 12 Aug 2017 22:10:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752501AbdHLMKM (ORCPT ); Sat, 12 Aug 2017 08:10:12 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:57947 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752216AbdHLMKL (ORCPT ); Sat, 12 Aug 2017 08:10:11 -0400 Received: from mail.nwl.cc (orbyte.nwl.cc [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id D083868252; Sat, 12 Aug 2017 14:10:10 +0200 (CEST) Received: from xsao (localhost [IPv6:::1]) by mail.nwl.cc (Postfix) with ESMTP id B4020681D7; Sat, 12 Aug 2017 14:10:10 +0200 (CEST) From: Phil Sutter To: Stephen Hemminger Cc: netdev@vger.kernel.org Subject: [iproute PATCH 46/51] tipc/node: Fix socket fd check in cmd_node_get_addr() Date: Sat, 12 Aug 2017 14:05:05 +0200 Message-Id: <20170812120510.28750-47-phil@nwl.cc> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170812120510.28750-1-phil@nwl.cc> References: <20170812120510.28750-1-phil@nwl.cc> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org socket() returns -1 on error, not 0. Signed-off-by: Phil Sutter --- tipc/node.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tipc/node.c b/tipc/node.c index 201fe1a4df3bd..fe085aec9b4ac 100644 --- a/tipc/node.c +++ b/tipc/node.c @@ -109,7 +109,8 @@ static int cmd_node_get_addr(struct nlmsghdr *nlh, const struct cmd *cmd, socklen_t sz = sizeof(struct sockaddr_tipc); struct sockaddr_tipc addr; - if (!(sk = socket(AF_TIPC, SOCK_RDM, 0))) { + sk = socket(AF_TIPC, SOCK_RDM, 0); + if (sk < 0) { fprintf(stderr, "opening TIPC socket: %s\n", strerror(errno)); return -1; }