From patchwork Mon Dec 24 00:54:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 1018164 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="m594MeOh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43NLbM0VBWz9sCr for ; Mon, 24 Dec 2018 12:03:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726409AbeLXBDv (ORCPT ); Sun, 23 Dec 2018 20:03:51 -0500 Received: from mta-p5.oit.umn.edu ([134.84.196.205]:47754 "EHLO mta-p5.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726016AbeLXBDv (ORCPT ); Sun, 23 Dec 2018 20:03:51 -0500 X-Greylist: delayed 499 seconds by postgrey-1.27 at vger.kernel.org; Sun, 23 Dec 2018 20:03:49 EST Received: from localhost (unknown [127.0.0.1]) by mta-p5.oit.umn.edu (Postfix) with ESMTP id 6B39CC03 for ; Mon, 24 Dec 2018 00:55:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p5.oit.umn.edu ([127.0.0.1]) by localhost (mta-p5.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tFD7uOxIKgv2 for ; Sun, 23 Dec 2018 18:55:30 -0600 (CST) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p5.oit.umn.edu (Postfix) with ESMTPS id 3A7EABB5 for ; Sun, 23 Dec 2018 18:55:30 -0600 (CST) Received: by mail-io1-f70.google.com with SMTP id m12so10609242ioc.16 for ; Sun, 23 Dec 2018 16:55:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=8rE0A9BsmRipspGDaSpFgsJdz4hxNU545p0jPEDLIlo=; b=m594MeOhv0nR4OrrDzkm+ZNHHIIITozJmElqAN3W6m5DFbl8LxqwH7Rp3MgYJvDAny 0P5Bpu4KOVWrf1HeHJowFtI8y+XkAJd68dzExkSzLb3PdfyucGH5H+Tp+i5fltwFTD+A oa1JwmcLIv3Qke2IPmq5SuDxU+GeYWCn7MrmzMJ+sobEZz/fSjDjPj/4H3DXDCcLCYz8 J6jgSprketEgJfmdsN1gjdXvYG+t95dqqUgvmpypS22/dq/IvS4y67DCeG0xjxexGB79 4IZMh+RTPRx1SIaRuT691m3JWa+lzS5VFeIU95PzE76gS0A8Wbe2X4yHlPTf7hyX49pU 4CRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8rE0A9BsmRipspGDaSpFgsJdz4hxNU545p0jPEDLIlo=; b=r8DW1jKGvYzKrX395TUdqoBH1auqrIzT4b1Qp3Kmy91ejPClmv7qsx6p7cDszARbOr gPRQZtcF3UhNJaRDnRcXvhwSXjqo+tqK3LTpHQt7KY7USJacLA3oAVe5D6EC0S4bOCsU PtNh+lHFg/deEbRg5gtpiB6x4sOgOFGE83llYW91fvGhO05E04YwVsF9W5S3HlJaO/WX zRVZ9bcp7iSee15Sk3tpDbDt8DLcXEuB2VEnAYyKzuffv7n4vXvvGdcX/YyIcT0G0nW1 55ejueETreoWQbzUuyj5DPGKu4+BvGDUy5NCg18vG20ChxMbrrKIdYLsgtGJxbJdx/KK fA1g== X-Gm-Message-State: AJcUukeP4J0zjwNI9uimVOSmKHjZm6H6kuJ4vVSIb5xD4QwqBqZ6e8Po JpBTwPcdbim2E46/fgiF3mAnGzRvykDPV0dY1aJp1LNrvFWaNjXw+kv3Z8vux1W4nmHefWXA/ja 7sZKLynPK3K+Gcx7buyGC X-Received: by 2002:a24:d441:: with SMTP id x62mr7500261itg.141.1545612929780; Sun, 23 Dec 2018 16:55:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/XUBnZ47ije2EWYdFP5ymYsCkKHUtpM+vQ43bZOVjAKTz4LuRYwG/vuwzQ2zKcJnZMEhl2FVQ== X-Received: by 2002:a24:d441:: with SMTP id x62mr7500254itg.141.1545612929562; Sun, 23 Dec 2018 16:55:29 -0800 (PST) Received: from cs-u-syssec1.cs.umn.edu (cs-u-syssec1.cs.umn.edu. [134.84.121.78]) by smtp.gmail.com with ESMTPSA id m45sm9596157iti.10.2018.12.23.16.55.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 16:55:29 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Jon Maloy , Ying Xue , "David S. Miller" , netdev@vger.kernel.org, tipc-discussion@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] net/netlink_compat: Fix a missing check of nla_parse_nested Date: Sun, 23 Dec 2018 18:54:53 -0600 Message-Id: <20181224005453.9992-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In tipc_nl_compat_sk_dump(), if nla_parse_nested() fails, it could return an error. To be consistent with other invocations of the function call, on error, the fix passes the return value upstream. Signed-off-by: Aditya Pakki --- net/tipc/netlink_compat.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index 6376467e78f8..21f6ccc89401 100644 --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c @@ -951,8 +951,11 @@ static int tipc_nl_compat_sk_dump(struct tipc_nl_compat_msg *msg, u32 node; struct nlattr *con[TIPC_NLA_CON_MAX + 1]; - nla_parse_nested(con, TIPC_NLA_CON_MAX, - sock[TIPC_NLA_SOCK_CON], NULL, NULL); + err = nla_parse_nested(con, TIPC_NLA_CON_MAX, + sock[TIPC_NLA_SOCK_CON], NULL, NULL); + + if (err) + return err; node = nla_get_u32(con[TIPC_NLA_CON_NODE]); tipc_tlv_sprintf(msg->rep, " connected to <%u.%u.%u:%u>",