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=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 9130FC10F13 for ; Sun, 14 Apr 2019 18:02:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FF5220850 for ; Sun, 14 Apr 2019 18:02:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="tgTOXBdB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726283AbfDNSCK (ORCPT ); Sun, 14 Apr 2019 14:02:10 -0400 Received: from mail-yb1-f201.google.com ([209.85.219.201]:34532 "EHLO mail-yb1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725829AbfDNSCJ (ORCPT ); Sun, 14 Apr 2019 14:02:09 -0400 Received: by mail-yb1-f201.google.com with SMTP id y1so11520006ybg.1 for ; Sun, 14 Apr 2019 11:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=I07oP8xrSzijjSwlaErDg38bYAunFPieZZAooCoHB0w=; b=tgTOXBdBRtJMgnkCXX+YOxFFsZFZf53j0xP2y7D1So8tXxuUkWytSIgUE2N3gRsdnr +L38HxceWYbXABAkQZO0dxdPuRREXmx7dBkaSswaFnkKpIkK7W25++Ekf/bUwZjcVszQ rgNfMYcW7hXsnsyQ9CrhyWTK1S6gWoHCc4Lf9Z72KR2YLqMBgHLIEqf1A6ifjOg+SirJ QvT/xfLL3VkmDKXxi3Ce4GxVi/f09mw9wmfFHt4vXXodXSRHyNuLuzJO/NTQs0CCRUgb GhUk0eMXvSZH4xqKoglqq+B0KhUr0vZpsubyC7RnJStbLyZpkI2GZ4PBid0jgg3ul1m4 tlyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=I07oP8xrSzijjSwlaErDg38bYAunFPieZZAooCoHB0w=; b=qfx/YGbxZYvUOCtND7GRoE9/rMaqffuZqpGOw7PXcTFqgt0OyruGuyKm1h7SUvTd/D 3mwSTAmHD/ZKFHbvLH9VAz3QggeHXEX3UBFkwuT5zggg9mQfbS1ynhmzmH3tHLE8GL3W bwD9kJ6ZTqb/5k2O/fcB4+Cymg1RTz8Oq9WRde6/F3hR62OyMzD5Z9fQzbh3wgOTdefW CB7kaHjH+W0BHY/h/NGErqQyjRdLK09gI+Z8iTtP4ZnT9YpohOziTqNdE3WTf7At8oUi vx/tSdtdqw9iOoQuAR7a89SLm8SnKeYEBzepEJS4DxeQJc5I+tXKnPismSGoXUVZXdPB PsMQ== X-Gm-Message-State: APjAAAW035lMxpTnVU12IUGqKHENhnXAPSYBe+BS+zRVWQ6P3+BkRaNG fbylKEg39ZuVEZ8XpLr3DTz3rVJ22ZCiXw== X-Google-Smtp-Source: APXvYqwmgiPJpaUNFxbuNONuFjB1BP0CwqdEB5hQInoyYiy0JiCiGPYI4UScRt1R0WQyYeu0RY+M8c8clAgLiQ== X-Received: by 2002:a25:c08d:: with SMTP id c135mr12398900ybf.61.1555264928922; Sun, 14 Apr 2019 11:02:08 -0700 (PDT) Date: Sun, 14 Apr 2019 11:02:05 -0700 Message-Id: <20190414180205.235592-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog Subject: [PATCH net] rtnetlink: fix rtnl_valid_stats_req() nlmsg_len check From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , syzbot , Jakub Kicinski Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Jakub forgot to either use nlmsg_len() or nlmsg_msg_size(), allowing KMSAN to detect a possible uninit-value in rtnl_stats_get BUG: KMSAN: uninit-value in rtnl_stats_get+0x6d9/0x11d0 net/core/rtnetlink.c:4997 CPU: 0 PID: 10428 Comm: syz-executor034 Not tainted 5.1.0-rc2+ #24 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x173/0x1d0 lib/dump_stack.c:113 kmsan_report+0x131/0x2a0 mm/kmsan/kmsan.c:619 __msan_warning+0x7a/0xf0 mm/kmsan/kmsan_instr.c:310 rtnl_stats_get+0x6d9/0x11d0 net/core/rtnetlink.c:4997 rtnetlink_rcv_msg+0x115b/0x1550 net/core/rtnetlink.c:5192 netlink_rcv_skb+0x431/0x620 net/netlink/af_netlink.c:2485 rtnetlink_rcv+0x50/0x60 net/core/rtnetlink.c:5210 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:1925 sock_sendmsg_nosec net/socket.c:622 [inline] sock_sendmsg net/socket.c:632 [inline] ___sys_sendmsg+0xdb3/0x1220 net/socket.c:2137 __sys_sendmsg net/socket.c:2175 [inline] __do_sys_sendmsg net/socket.c:2184 [inline] __se_sys_sendmsg+0x305/0x460 net/socket.c:2182 __x64_sys_sendmsg+0x4a/0x70 net/socket.c:2182 do_syscall_64+0xbc/0xf0 arch/x86/entry/common.c:291 entry_SYSCALL_64_after_hwframe+0x63/0xe7 Fixes: 51bc860d4a99 ("rtnetlink: stats: validate attributes in get as well as dumps") Signed-off-by: Eric Dumazet Reported-by: syzbot Cc: Jakub Kicinski --- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index a51cab95ba64c7d76a2ba0940c67e9f6e53f54e1..220c56e936592495656962050d285bb1c0024b37 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -4948,7 +4948,7 @@ static int rtnl_valid_stats_req(const struct nlmsghdr *nlh, bool strict_check, { struct if_stats_msg *ifsm; - if (nlh->nlmsg_len < sizeof(*ifsm)) { + if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifsm))) { NL_SET_ERR_MSG(extack, "Invalid header for stats dump"); return -EINVAL; } -- 2.21.0.392.gf8f6787159e-goog