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,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 31F5DC43381 for ; Sun, 31 Mar 2019 14:50:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2DFF20882 for ; Sun, 31 Mar 2019 14:50:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f2UAxPD3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731272AbfCaOuh (ORCPT ); Sun, 31 Mar 2019 10:50:37 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38362 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731130AbfCaOug (ORCPT ); Sun, 31 Mar 2019 10:50:36 -0400 Received: by mail-pf1-f193.google.com with SMTP id 10so3264670pfo.5 for ; Sun, 31 Mar 2019 07:50:36 -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=TUz9AKirIKWUjpfra0d5vKmBMkE5G5KD62xeuaBmNng=; b=f2UAxPD3XdsBevENdtgQdtAwL3n3TnyHT0ehGnS/ih15HpD/W4IGwju7NEbIKkUlkT Zevry/UF689/s4T8akBN/j/nhzCuBuHlB66w7IMcCuVT584GlZ9wpS/01EHPZa/B1OR9 2U/6U4Hns/btq621cBUzL4bF8kL7GUyJUE9xfLD2d0L1x3OoU9LY5b9qjxgRM08U0kr9 /qJrT3cIMTKhF/Q51Ol4SZUy9l3XIgZkjB+lcIdO7EoWl4eWne9WSUKhcoGe6Qo2CGan Z7Xk/FnVKEiMe3SzhQxGDBQH9UoQWclY05vL+HbOItbTt2oKU74wYnpwBon7DHo84u/l Z00w== 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=TUz9AKirIKWUjpfra0d5vKmBMkE5G5KD62xeuaBmNng=; b=WuGN1XFFmqTyRXujXGtUFPdMe1c0ItjJ5GMGHZtfeci++6Mrgvc5F24EmOHgbcgSfY Ro6GYJkOA6WlQrLV5WsVi4BVtpcqpeZoKs1tMJ5aBi9DYAqHq+xvoF8VuYGrdWKc1psO LVHS14h2HJnVTcKjXsiXokjt/bhYIdk/yQ8I7mYwF6L4l/9tK3lmB6mVq1+4MbFEZBGP fFyK/7Hi4CnWpmbOLNRcOPdfywAV8R8laB4w5lJfHwOgCVd2x9axyKrYP9B22ofJLXW4 B8KF5+N4OYPFRCjrE2irPMsiOpM7vxNuuWL6Z9wIMbKwb5xBUw0l10vymLPAWj5RE+Wl PXfw== X-Gm-Message-State: APjAAAU34PWLWhcCRpHqgthKJO5MHsCgsYmpO55NtMDAfi7t7M3s/03c PUdsRTY+tvLpwYncBRalwQVPuBVbDg4= X-Google-Smtp-Source: APXvYqzGpzX87BLfidGFb2e1y7VmH2aOD9hSYo7sLslJTdho01g4z0J7EGtFzFWEiW0cTIlFG/UnTQ== X-Received: by 2002:aa7:920b:: with SMTP id 11mr55982981pfo.3.1554043835951; Sun, 31 Mar 2019 07:50:35 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id a12sm8792481pgq.21.2019.03.31.07.50.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 07:50:35 -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 2/3] tipc: check link name with right length in tipc_nl_compat_link_set Date: Sun, 31 Mar 2019 22:50:09 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <19cb47f4096770465dc8a9fb08cfaedc2fb70da4.1554043518.git.lucien.xin@gmail.com> 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 A similar issue as fixed by Patch "tipc: check bearer name with right length in tipc_nl_compat_bearer_enable" was also found by syzbot in tipc_nl_compat_link_set(). The length to check with should be 'TLV_GET_DATA_LEN(msg->req) - offsetof(struct tipc_link_config, name)'. Reported-by: syzbot+de00a87b8644a582ae79@syzkaller.appspotmail.com Signed-off-by: Xin Long --- net/tipc/netlink_compat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index 5f8e53c..0bfd03d6 100644 --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c @@ -771,7 +771,12 @@ static int tipc_nl_compat_link_set(struct tipc_nl_compat_cmd_doit *cmd, lc = (struct tipc_link_config *)TLV_DATA(msg->req); - len = min_t(int, TLV_GET_DATA_LEN(msg->req), TIPC_MAX_LINK_NAME); + len = TLV_GET_DATA_LEN(msg->req); + len -= offsetof(struct tipc_link_config, name); + if (len <= 0) + return -EINVAL; + + len = min_t(int, len, TIPC_MAX_LINK_NAME); if (!string_is_valid(lc->name, len)) return -EINVAL; -- 2.1.0