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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 1E00FC43381 for ; Fri, 15 Mar 2019 17:12:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4307218D0 for ; Fri, 15 Mar 2019 17:12:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="jRvj2lI8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729611AbfCORMR (ORCPT ); Fri, 15 Mar 2019 13:12:17 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:55324 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727460AbfCORMQ (ORCPT ); Fri, 15 Mar 2019 13:12:16 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 39160CDB for ; Fri, 15 Mar 2019 17:12:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RiZkf-BDhX-Y for ; Fri, 15 Mar 2019 12:12:15 -0500 (CDT) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 0246DCDD for ; Fri, 15 Mar 2019 12:12:15 -0500 (CDT) Received: by mail-io1-f69.google.com with SMTP id b199so7528676iof.14 for ; Fri, 15 Mar 2019 10:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ppq+jOjQfaVe+0EvGu/B2tt3ryg7tgco2DiirhGxXeE=; b=jRvj2lI8zAqKCV4HqoFWHyWWePvrmUFEgrS8XT6M178mQOYZPrRIGp0UVFF7lIygFW MpHOF2+syqWlip6hwMJ1NmmVwEZbzqhDNXFWEhd6mg8e+B/jvIvOsoXPLLdjgW9ojHyY gsaqk43/TCPpgBv0d6cEoWRFNxd8lUgYJ7GqI7pVrj6UP6Zlld0ALAYYUMYgD5HKYyP+ EUB+arh76cGiWQ9ZgZr9rLws8VgLDfIDoLoZolYo/xcNxGywKlSgXWCKxONwo2B9OS7f XkwTogwY9ltt70AmsSlCU4Sf2cQOEXmW/UFsrDr973VsLxOcVbHn8kJxOfunLEeuaMAv AuTA== 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:in-reply-to :references; bh=ppq+jOjQfaVe+0EvGu/B2tt3ryg7tgco2DiirhGxXeE=; b=mo8PLV64UF48n29SOzDW8j5DUwOZxbWBOFodF/zTDicP3+0HbvTi8v8FU7Tqhfyd4O MTV4+5/3Ka6yspsDIlY1+ciYhOhSdNrxMqAUC5obTbcemVqeW/5e+WlCjKbSHmUVH2bi IfSzX1qlgZfkc+Lh5QUWtbvFXJbilNBTpgvXX1w2M271lYhXcbkxMoutx+p2G+vdeZTI 27vgHMF81+c0YdS+NV4qRXTDqfD+wBhQb7XoEgBTfj+Eb7VQFf4XSlQaQUd02dh/dFPk Lx7Ra23P1U0W2CsL9jimTHXSzJnSScQCpcaD0sgWQEf6Rj3oShT7er3firJsCxCb1/JF 160A== X-Gm-Message-State: APjAAAVL+Zgbj541QsJVGjTsuvsfamUWzkiS7YUkICSlIEHph/eyPEHU 0D8Mcxr99i/WhQEfIi5dz/bO+kcUT3vtooeKFQHFK4PFjgVHMNE0HMO9Bnqx8CJKAmwBISOGXdq 6WjZWufrLevMqEWCLxM6i X-Received: by 2002:a02:168a:: with SMTP id a132mr3162298jaa.101.1552669934605; Fri, 15 Mar 2019 10:12:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwFpo7G1D9IoruFFhTQUTzXdRh+24Z4zZAM7Cn5X4NOcM60cv6baLLER5Zb/82pQqeWOiTM/g== X-Received: by 2002:a02:168a:: with SMTP id a132mr3162283jaa.101.1552669934382; Fri, 15 Mar 2019 10:12:14 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id m23sm977096ioh.29.2019.03.15.10.12.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Mar 2019 10:12:13 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@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: tipc: fix a missing check of nla_nest_start Date: Fri, 15 Mar 2019 12:11:59 -0500 Message-Id: <20190315171200.5269-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <1d97622a-6404-6600-c06b-9450b225742b@cogentembedded.com> References: <1d97622a-6404-6600-c06b-9450b225742b@cogentembedded.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org nla_nest_start could fail and requires a check. The fix returns -EMSGSIZE if it fails. Signed-off-by: Kangjie Lu --- net/tipc/group.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/tipc/group.c b/net/tipc/group.c index 06fee142f09f..63f39201e41e 100644 --- a/net/tipc/group.c +++ b/net/tipc/group.c @@ -919,6 +919,9 @@ int tipc_group_fill_sock_diag(struct tipc_group *grp, struct sk_buff *skb) { struct nlattr *group = nla_nest_start(skb, TIPC_NLA_SOCK_GROUP); + if (!group) + return -EMSGSIZE; + if (nla_put_u32(skb, TIPC_NLA_SOCK_GROUP_ID, grp->type) || nla_put_u32(skb, TIPC_NLA_SOCK_GROUP_INSTANCE, -- 2.17.1