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,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 70062C4360F for ; Fri, 15 Mar 2019 06:07:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CCE22184C for ; Fri, 15 Mar 2019 06:07:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=umn.edu header.i=@umn.edu header.b="LA37jLTv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728323AbfCOGHs (ORCPT ); Fri, 15 Mar 2019 02:07:48 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:42398 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728050AbfCOGHr (ORCPT ); Fri, 15 Mar 2019 02:07:47 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 64876D53 for ; Fri, 15 Mar 2019 06:07:46 +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 xkx4PzHOK_60 for ; Fri, 15 Mar 2019 01:07:46 -0500 (CDT) Received: from mail-it1-f199.google.com (mail-it1-f199.google.com [209.85.166.199]) (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 2FBCAD4B for ; Fri, 15 Mar 2019 01:07:46 -0500 (CDT) Received: by mail-it1-f199.google.com with SMTP id i4so6872660itb.1 for ; Thu, 14 Mar 2019 23:07:46 -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; bh=Tx35QUGia3FusaCVI8xy2kdI7NujUqqw3ykVJkkEoIQ=; b=LA37jLTvTwv4Sm21XotKTWZkDCZF0hqeCjcF7EhzNuHdK0qoeQGwKf5e2VcJFjt0wd 4tO5v+rpQsQUG6iAXfj0YMGuIDFTD8lZoZQfBdfg7CFd6FkTLlprOvL9tHQOYrtGTBGS PGyfRrGIaCh93445EVn8f2m6jxgM5+PXEMTh6Y29lFwxgLJblYFytHbIlMbtG01xD5uv GAxDcqkVHxiutV8wxZBpIIyUL8tEUre1WvN7kBSxh7utn7E2SYaG3U8vEn5JCL5COUAf hJYT5AFAZygeOlxXzRfvCsv5BkTFgut0jMasql7ZDZho/uhRnX5xud4PLXgOKTfql4V0 A4mQ== 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=Tx35QUGia3FusaCVI8xy2kdI7NujUqqw3ykVJkkEoIQ=; b=V85MA/BeHPHfp9sx+X9KxsRAx3gIf8tRL2AlOmFzEU85y65igYGOFLcYTDMZmq7Eg2 NfM2CLLsksOsCu1R6oMilJfOGmeIezxh29aEgt+HOYJSFxslhwbOs6jPb4Mgk12Ebhp+ rLOGnxSG8PIZo8r/PpYqS6AzjTyUicdhCwlkO+NZFTPy8RaEEtXHUjYyNZ60brL20cjp fhICSPwKCJhcCi+6YGCthtyeQXmKtBDotfx0zhJ2NquAXSQEJXoPET20wwf48XkA4vC8 y+bZjlCpK74H4HfY0dZah8nd4YSf8HUINjbPgA5ph+KdkA64WPQhTdOuQ6ZFOdr8P3vl SokQ== X-Gm-Message-State: APjAAAWk/SuzgcyXgrmAK3dyuNn71kvqHx1yOQfdj1Kd1k6ospEoeC8w 34v4mypZOjF7kYSM//qKSWCshDAmAgkXuy9Xv3Ik4OIMKNXL5Qt+L74FWF3q24LxjJ5FHtzZNRd Fgk3NenZ+QoEh85LloFL/ X-Received: by 2002:a6b:144b:: with SMTP id 72mr1086502iou.191.1552630065801; Thu, 14 Mar 2019 23:07:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyBf+9aZMAg1rDVA3mw958c4UcRLm6naAC8ITylmC/5s0TL3o6P5F3SA+arGKKJNEOC9vtvlg== X-Received: by 2002:a6b:144b:: with SMTP id 72mr1086490iou.191.1552630065570; Thu, 14 Mar 2019 23:07:45 -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 b16sm609787itb.26.2019.03.14.23.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 23:07:44 -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 01:07:39 -0500 Message-Id: <20190315060740.13920-1-kjlu@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 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/tipc/group.c b/net/tipc/group.c index 06fee142f09f..117867e480ba 100644 --- a/net/tipc/group.c +++ b/net/tipc/group.c @@ -918,6 +918,8 @@ void tipc_group_member_evt(struct tipc_group *grp, 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) || -- 2.17.1