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,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 E7CA9C282C4 for ; Tue, 12 Feb 2019 06:00:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A21F4217FA for ; Tue, 12 Feb 2019 06:00:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Iii5JKcX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726049AbfBLGAO (ORCPT ); Tue, 12 Feb 2019 01:00:14 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:34478 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725916AbfBLGAO (ORCPT ); Tue, 12 Feb 2019 01:00:14 -0500 Received: by mail-pl1-f195.google.com with SMTP id w4so779790plz.1 for ; Mon, 11 Feb 2019 22:00:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=a0iM+EB2mCaFYKA0tFQBZZqpR34hxpwYaeASSuB88uU=; b=Iii5JKcXGed+KVl3szF1U0oNcLcCsYT2iiFAXGPORd/RDjh6V0MgJwVEMnQnR18sUG S3Ddh3lSl3e+UAPQk15G5sLy6R6aXWqldMyLaqV5Ygl+Ic+L97Vu8vlVM97QxN5adCBk gs9sBltFb5axvygFnfcVOuk36notnhomOzHNUy4CWEVmKoib1rRr77zRtsdNbU6JdyIh fu4ws5kNVTlghiv01/e5DJDg7VfUeJ/Klj3d5HAjfV2EUnt0UHHbTpvjmflKOh8+TrMj QWhKAoxsYEYkadQmIM/DQrqcNsllWVmqHSkP9DAGgN7nWAZPGrhT8RGr7zG1ACHle1Rl gDjw== 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:mime-version :content-transfer-encoding; bh=a0iM+EB2mCaFYKA0tFQBZZqpR34hxpwYaeASSuB88uU=; b=DKtvvz7hu942X7t8WuNK9XWbWnQVeVpMsVR+VvWz/uo1QqNc3UeHvcFHkE7lwwUu/1 JSLqJd2WPsVX/XZPdwW4aBJnSKC1q5NlvDu7XtK0QpUjpfiyRVrf4ptA2Q/90tJ8lavt va6rcQp4WJi4XfmFFPuYHTOO7uWR79O24ZSsmUYEYvkrTFim2VhviD7c/U4qsEgAzob6 jj8Tgdbkcm8WTammvM3IoPKJgTHjU2VR6BDfbksEGC79SX4nSjloHznFYzHqbeZJdb+d 7oCVLouuOmYhnee1wi4+W6Xd451OaZIIkm7C+QFFQSCCh32F6JXjlY1riCRg2kTfBm2d L5Bg== X-Gm-Message-State: AHQUAuZIBlLun41oThQo7KbY3bnLabVS17hKYJKeOiBlnIebfwbEJfTT U1azUsahp/IkxlAceLOTTyf90oNl X-Google-Smtp-Source: AHgI3IZp1sljnQyuHc9ZUkUWlmKsZyU9lwH3BTUAoBI1TKY9o69mbygj76RjOJVzo5PMWlzAT4c/vQ== X-Received: by 2002:a17:902:704b:: with SMTP id h11mr2293743plt.157.1549951213209; Mon, 11 Feb 2019 22:00:13 -0800 (PST) Received: from tw-172-25-17-123.office.twttr.net ([8.25.197.26]) by smtp.gmail.com with ESMTPSA id s2sm22352599pfa.167.2019.02.11.22.00.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 22:00:11 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , syzbot+4d4af685432dc0e56c91@syzkaller.appspotmail.com, syzbot+68ee510075cf64260cc4@syzkaller.appspotmail.com, Jiri Pirko , Paolo Abeni Subject: [Patch net] team: avoid complex list operations in team_nl_cmd_options_set() Date: Mon, 11 Feb 2019 21:59:51 -0800 Message-Id: <20190212055951.6712-1-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current opt_inst_list operations inside team_nl_cmd_options_set() is too complex to track: LIST_HEAD(opt_inst_list); nla_for_each_nested(...) { list_for_each_entry(opt_inst, &team->option_inst_list, list) { if (__team_option_inst_tmp_find(&opt_inst_list, opt_inst)) continue; list_add(&opt_inst->tmp_list, &opt_inst_list); } } team_nl_send_event_options_get(team, &opt_inst_list); as while we retrieve 'opt_inst' from team->option_inst_list, it could be added to the local 'opt_inst_list' for multiple times. The __team_option_inst_tmp_find() doesn't work, as the setter team_mode_option_set() still calls team->ops.exit() which uses ->tmp_list too in __team_options_change_check(). Simplify the list operations by moving the 'opt_inst_list' and team_nl_send_event_options_get() into the nla_for_each_nested() loop so that it can be guranteed that we won't insert a same list entry for multiple times. Therefore, __team_option_inst_tmp_find() can be removed too. Fixes: 4fb0534fb7bb ("team: avoid adding twice the same option to the event list") Fixes: 2fcdb2c9e659 ("team: allow to send multiple set events in one message") Reported-by: syzbot+4d4af685432dc0e56c91@syzkaller.appspotmail.com Reported-by: syzbot+68ee510075cf64260cc4@syzkaller.appspotmail.com Cc: Jiri Pirko Cc: Paolo Abeni Signed-off-by: Cong Wang --- drivers/net/team/team.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index afd9d25d1992..958f1cf67282 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -256,17 +256,6 @@ static void __team_option_inst_mark_removed_port(struct team *team, } } -static bool __team_option_inst_tmp_find(const struct list_head *opts, - const struct team_option_inst *needle) -{ - struct team_option_inst *opt_inst; - - list_for_each_entry(opt_inst, opts, tmp_list) - if (opt_inst == needle) - return true; - return false; -} - static int __team_options_register(struct team *team, const struct team_option *option, size_t option_count) @@ -2460,7 +2449,6 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info) int err = 0; int i; struct nlattr *nl_option; - LIST_HEAD(opt_inst_list); rtnl_lock(); @@ -2480,6 +2468,7 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info) struct nlattr *opt_attrs[TEAM_ATTR_OPTION_MAX + 1]; struct nlattr *attr; struct nlattr *attr_data; + LIST_HEAD(opt_inst_list); enum team_option_type opt_type; int opt_port_ifindex = 0; /* != 0 for per-port options */ u32 opt_array_index = 0; @@ -2584,23 +2573,17 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info) if (err) goto team_put; opt_inst->changed = true; - - /* dumb/evil user-space can send us duplicate opt, - * keep only the last one - */ - if (__team_option_inst_tmp_find(&opt_inst_list, - opt_inst)) - continue; - list_add(&opt_inst->tmp_list, &opt_inst_list); } if (!opt_found) { err = -ENOENT; goto team_put; } - } - err = team_nl_send_event_options_get(team, &opt_inst_list); + err = team_nl_send_event_options_get(team, &opt_inst_list); + if (err) + break; + } team_put: team_nl_team_put(team); -- 2.20.1