Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp427760pxf; Wed, 10 Mar 2021 08:58:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJx73Gfh/n4u6xfpTH3+GoQH0NYbfMMRLsH143sGA7o3+iDF5zplnmTKIH5l6qTJYSmNmTQY X-Received: by 2002:aa7:d385:: with SMTP id x5mr4429860edq.289.1615395496625; Wed, 10 Mar 2021 08:58:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615395496; cv=none; d=google.com; s=arc-20160816; b=wDNQGJjgF1IgmYEkA4GdL/Z3xeYLYGKl70+yg3ZMOWneRoQyBizbPGuCQcQ7lJuQjc ccRLSa/XMWHMS1kkkY3WU7WMiHXxl06MfSSyj2QyMg08esnEJqEMvNBcA1+vQbp/5WC3 lnVfjeJxQod+uHS72WxsExBhYQ4R3FnGyr4OABqkmxMS7atxAT71JIhYNFOMnAQ2vVB3 L7savvFBlIMPGXold2oGX3c+o8zeh1AorXDtatErIy1CMJxjr3SVRnK8xigOqmSnknuc cgnR5TEwSBCEvJROfF0TDlBdtcterwqg2bg/ZOPQxLDU+HVpGCTMzcsCNqo1O9nI2J+P dw5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=xvXCi+ZA93XCGEQDvUcBtJfy5hMDY05M48bcNWKSXvM=; b=vw4wmsIXcDxjllpBRIjVFknfNzEKQETv4QUaAztTyDQU4b+4nmlQiswCzW9FdYdI/O i78eKs8jnW6OpLggjFzKCO5Tvwaz4BH2QCHaS2hpzwOBRUjUib14XzWrDj/C+jIOFsXS Mg9T31uqdXABfGPiI3kphTvx1MdUpE9ZjelKZBFlTw37sO88thFHj1bmRS4j331BpyH7 2LN50VRYORXYXTQw2jwK8E43LkXKRPGw/Kw6vcNzrWv5jZnLEwHvCKOgnGOkiQjNqmlM 0iQAlY+WhQnXqFKZVOVXFF/jcjL5jZ6V/4HiB9KIhd+VeUfb68gOagoVG/PLnBdXGLyz sIEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=D+10ukdY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g16si1318497ejf.96.2021.03.10.08.57.53; Wed, 10 Mar 2021 08:58:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=D+10ukdY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233537AbhCJQz3 (ORCPT + 99 others); Wed, 10 Mar 2021 11:55:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232278AbhCJQzI (ORCPT ); Wed, 10 Mar 2021 11:55:08 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 681B9C061760; Wed, 10 Mar 2021 08:55:08 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id a18so24086546wrc.13; Wed, 10 Mar 2021 08:55:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=xvXCi+ZA93XCGEQDvUcBtJfy5hMDY05M48bcNWKSXvM=; b=D+10ukdYOKCe2WcZwhUbwo5dw9yLADpXBvXlHL+PsCKlgwhSGq7dC8C4z7u6feuPd+ IM80iWrEb6a4bed0lZ3nKWoNxmMTzazvxLJc0Dp4IDbT9dKC0AxywZXd/2cR1vWgLD7L 7WhtOTqOZyDZDlXKdRu/Gwk76CfhH3YS5bErqKPSLlm7uiR89Ju6rYGkPVpaDji8FT6l 15NcSf6hjEJmho8SQC0Vau7z+uIdNPkCLzNzKcpqHnKO3yBNRIs17RLxe+f9T9gp4Vy+ xWjvDfB5a+8CuMsSpoWFMDn+WZthun5Kmprj7xjJYwQJN/fu/8vMFVSfZM+tFYtPsKG8 oXtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=xvXCi+ZA93XCGEQDvUcBtJfy5hMDY05M48bcNWKSXvM=; b=l0vBxlrtapIYPWLvyu9QUkmUP4FoKvrC46Q9YL9sQMH7s7/T4yr7NctWsFMogLLgz1 Ya26/fQhXB/ReB5A4szGidCe80Ydc35dSbzi+oR0lG1y+fqVFLeWDnGeNkJAMzES9hcO M8Dt3Ii2fAei+RW8ikfBiFzphC6ZlxMKRzE8L/+qS+fEc4eEB+Fc0r/EEMNxhwRPwV2Y FLvZjDkCzUxMQVFeFLaBPEK/1N5Mhc4oeBFsWP/sMgxaN9TbGuaQT5WvrFFqcyBRBGt3 m8FugRAr2BQ9HJbDvMHfK73lyutvf6QvtUWuHbSUT9wLfShuLfcyBDBroph7xNKCoWmm uwzQ== X-Gm-Message-State: AOAM5304pkKxVIdFdKENbpt5BmI0kMsFWquzBoidWsWBGh+jLzA1cj08 5kwpxo7VGLdNcbXMsXTLDAc= X-Received: by 2002:adf:a3c2:: with SMTP id m2mr4471158wrb.195.1615395307139; Wed, 10 Mar 2021 08:55:07 -0800 (PST) Received: from [192.168.1.101] ([37.171.47.61]) by smtp.gmail.com with ESMTPSA id h6sm56288wmi.6.2021.03.10.08.55.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Mar 2021 08:55:06 -0800 (PST) Subject: Re: [PATCH] net: bonding: fix error return code of bond_neigh_init() To: Roi Dayan , Jia-Ju Bai , j.vosburgh@gmail.com, vfalico@gmail.com, andy@greyhouse.net, davem@davemloft.net, kuba@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Saeed Mahameed References: <20210308031102.26730-1-baijiaju1990@gmail.com> From: Eric Dumazet Message-ID: <5d4cbafa-dbad-9b66-c5be-bca6ecc8e6f3@gmail.com> Date: Wed, 10 Mar 2021 17:55:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/10/21 10:24 AM, Roi Dayan wrote: > > > On 2021-03-08 5:11 AM, Jia-Ju Bai wrote: >> When slave is NULL or slave_ops->ndo_neigh_setup is NULL, no error >> return code of bond_neigh_init() is assigned. >> To fix this bug, ret is assigned with -EINVAL in these cases. >> >> Fixes: 9e99bfefdbce ("bonding: fix bond_neigh_init()") >> Reported-by: TOTE Robot >> Signed-off-by: Jia-Ju Bai >> --- >>   drivers/net/bonding/bond_main.c | 8 ++++++-- >>   1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c >> index 74cbbb22470b..456315bef3a8 100644 >> --- a/drivers/net/bonding/bond_main.c >> +++ b/drivers/net/bonding/bond_main.c >> @@ -3978,11 +3978,15 @@ static int bond_neigh_init(struct neighbour *n) >>         rcu_read_lock(); >>       slave = bond_first_slave_rcu(bond); >> -    if (!slave) >> +    if (!slave) { >> +        ret = -EINVAL; >>           goto out; >> +    } >>       slave_ops = slave->dev->netdev_ops; >> -    if (!slave_ops->ndo_neigh_setup) >> +    if (!slave_ops->ndo_neigh_setup) { >> +        ret = -EINVAL; >>           goto out; >> +    } >>         /* TODO: find another way [1] to implement this. >>        * Passing a zeroed structure is fragile, >> > > > Hi, > > This breaks basic functionally that always worked. A slave doesn't need > to exists nor to implement ndo_neigh_setup. > Now trying to add a neigh entry because of that fails. > This commit needs to be reverted. > > Thanks, > Roi Agreed, this commit made no sense, please revert.