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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 B1F13C43381 for ; Sun, 31 Mar 2019 14:50:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A1BF20882 for ; Sun, 31 Mar 2019 14:50:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sl8Uoxcz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731283AbfCaOup (ORCPT ); Sun, 31 Mar 2019 10:50:45 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36761 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731130AbfCaOup (ORCPT ); Sun, 31 Mar 2019 10:50:45 -0400 Received: by mail-pg1-f195.google.com with SMTP id 85so3446450pgc.3 for ; Sun, 31 Mar 2019 07:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=FzjlZ+NjvAUgY/qmKGtWnOpBo2jU5dMxPoFcDowWuFY=; b=sl8UoxczDIU2rVzmuZxqfw9qQfYMxd4aJHW0C9zzeUZ7jDs3HQIcKrC0frc8fO+cJx g90X+q7iOHeA9nYTm9/gyAiYGulks66KFksPEwL4WqUykt+v2K7ZL9fFFInRa4sE/8mW Q78pDAgvaHdHm95ekqlkpIhcvQ1UHVL9BBWGdF5j6RHdWNICn3FA9N8cVsY8uOYIw5Jv FhNPog8b9lXSGGjmf9NwfIVeQLS0guMZ5q0mQizRLWw4Y/Z13sDScZGi/dpDjA0WI3qk vKEVoLK7cDQClzhDTAw5jf68PITbkfyoUSWIQ2ntJQom7Zzl+gi3qOnsyfiUtSuDNCd+ tzmA== 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:in-reply-to:references; bh=FzjlZ+NjvAUgY/qmKGtWnOpBo2jU5dMxPoFcDowWuFY=; b=Sj43l96ueupvfeE5TQkeCK0uT92+jgd+b9waJfECxeY+02pJShxOEryTol96k23GUC oWbx9yLj2dbMTuQr0p+5JeZ15YPVl1wbh9P37UvGH7tIrFM1UJhuiuHn3xXQZ5uw56eM u6Ley44dgKz6fW1dvuAzuK8LTYWs0g1hNSiX4/XMiUVdVaJSiZUTnmWKnlQbLf1Hvuay 9xlk5ZJNDASSavSL+OJKCMjOlwF/Zx2w9jrEcETgcAkKe+aAWWCys7xBLweTuguQ3ybX 2/5oLnPQbvsBbZN1d5hdDPps7cwKL8ynAEg2ib7tBwEAD6ws4NKjajSAERbnQEbCiiJM 5jrg== X-Gm-Message-State: APjAAAViIfF5CPH5U4f+5k67K3G2AJkr53FPqM2Ls9WBhBkjxzJGBGZF ZtaUsq2XwtchrH7dzHoFTECcTNpWqxA= X-Google-Smtp-Source: APXvYqwo96p3MDxC8KTUTnOL1+6MHl8KxCCnUm36WlAVarusPRJFFfhL4nWCHFiOkS/O4iZkK5UwRQ== X-Received: by 2002:a63:3282:: with SMTP id y124mr7684643pgy.417.1554043844290; Sun, 31 Mar 2019 07:50:44 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id z13sm3398488pgc.25.2019.03.31.07.50.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 07:50:43 -0700 (PDT) From: Xin Long To: network dev Cc: davem@davemloft.net, Jon Maloy , Ying Xue , tipc-discussion@lists.sourceforge.net, syzkaller@googlegroups.com Subject: [PATCH net 3/3] tipc: handle the err returned from cmd header function Date: Sun, 31 Mar 2019 22:50:10 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: <19cb47f4096770465dc8a9fb08cfaedc2fb70da4.1554043518.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Syzbot found a crash: BUG: KMSAN: uninit-value in tipc_nl_compat_name_table_dump+0x54f/0xcd0 net/tipc/netlink_compat.c:872 Call Trace: tipc_nl_compat_name_table_dump+0x54f/0xcd0 net/tipc/netlink_compat.c:872 __tipc_nl_compat_dumpit+0x59e/0xda0 net/tipc/netlink_compat.c:215 tipc_nl_compat_dumpit+0x63a/0x820 net/tipc/netlink_compat.c:280 tipc_nl_compat_handle net/tipc/netlink_compat.c:1226 [inline] tipc_nl_compat_recv+0x1b5f/0x2750 net/tipc/netlink_compat.c:1265 genl_family_rcv_msg net/netlink/genetlink.c:601 [inline] genl_rcv_msg+0x185f/0x1a60 net/netlink/genetlink.c:626 netlink_rcv_skb+0x431/0x620 net/netlink/af_netlink.c:2477 genl_rcv+0x63/0x80 net/netlink/genetlink.c:637 netlink_unicast_kernel net/netlink/af_netlink.c:1310 [inline] netlink_unicast+0xf3e/0x1020 net/netlink/af_netlink.c:1336 netlink_sendmsg+0x127f/0x1300 net/netlink/af_netlink.c:1917 sock_sendmsg_nosec net/socket.c:622 [inline] sock_sendmsg net/socket.c:632 [inline] Uninit was created at: __alloc_skb+0x309/0xa20 net/core/skbuff.c:208 alloc_skb include/linux/skbuff.h:1012 [inline] netlink_alloc_large_skb net/netlink/af_netlink.c:1182 [inline] netlink_sendmsg+0xb82/0x1300 net/netlink/af_netlink.c:1892 sock_sendmsg_nosec net/socket.c:622 [inline] sock_sendmsg net/socket.c:632 [inline] It was supposed to be fixed on commit 974cb0e3e7c9 ("tipc: fix uninit-value in tipc_nl_compat_name_table_dump") by checking TLV_GET_DATA_LEN(msg->req) in cmd->header()/tipc_nl_compat_name_table_dump_header(), which is called ahead of tipc_nl_compat_name_table_dump(). However, tipc_nl_compat_dumpit() doesn't handle the error returned from cmd header function. It means even when the check added in that fix fails, it won't stop calling tipc_nl_compat_name_table_dump(), and the issue will be triggered again. So this patch is to add the process for the err returned from cmd header function in tipc_nl_compat_dumpit(). Reported-by: syzbot+3ce8520484b0d4e260a5@syzkaller.appspotmail.com Signed-off-by: Xin Long --- net/tipc/netlink_compat.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index 0bfd03d6..340a6e7 100644 --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c @@ -267,8 +267,14 @@ static int tipc_nl_compat_dumpit(struct tipc_nl_compat_cmd_dump *cmd, if (msg->rep_type) tipc_tlv_init(msg->rep, msg->rep_type); - if (cmd->header) - (*cmd->header)(msg); + if (cmd->header) { + err = (*cmd->header)(msg); + if (err) { + kfree_skb(msg->rep); + msg->rep = NULL; + return err; + } + } arg = nlmsg_new(0, GFP_KERNEL); if (!arg) { -- 2.1.0