From patchwork Sat Aug 12 12:05:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 800882 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 3xV0xv6CQ1z9t3C for ; Sat, 12 Aug 2017 22:08:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752609AbdHLMIB (ORCPT ); Sat, 12 Aug 2017 08:08:01 -0400 Received: from orbyte.nwl.cc ([151.80.46.58]:45971 "EHLO mail.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752389AbdHLMF3 (ORCPT ); Sat, 12 Aug 2017 08:05:29 -0400 Received: from mail.nwl.cc (orbyte.nwl.cc [127.0.0.1]) by mail.nwl.cc (Postfix) with ESMTP id 670D0683D9; Sat, 12 Aug 2017 14:05:28 +0200 (CEST) Received: from xsao (localhost [IPv6:::1]) by mail.nwl.cc (Postfix) with ESMTP id AEDB968252; Sat, 12 Aug 2017 14:05:27 +0200 (CEST) From: Phil Sutter To: Stephen Hemminger Cc: netdev@vger.kernel.org Subject: [iproute PATCH 45/51] tipc/bearer: Prevent NULL pointer dereference Date: Sat, 12 Aug 2017 14:05:04 +0200 Message-Id: <20170812120510.28750-46-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 Signed-off-by: Phil Sutter --- tipc/bearer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tipc/bearer.c b/tipc/bearer.c index c3d4491f8f6ef..0598328ab1f1b 100644 --- a/tipc/bearer.c +++ b/tipc/bearer.c @@ -438,8 +438,8 @@ static int cmd_bearer_enable(struct nlmsghdr *nlh, const struct cmd *cmd, if (err) return err; - opt = get_opt(opts, "media"); - if (strcmp(opt->val, "udp") == 0) { + if ((opt = get_opt(opts, "media")) && + strcmp(opt->val, "udp") == 0) { err = nl_add_udp_enable_opts(nlh, opts, cmdl); if (err) return err;