From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751775AbdJWStP (ORCPT ); Mon, 23 Oct 2017 14:49:15 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:55560 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751573AbdJWStN (ORCPT ); Mon, 23 Oct 2017 14:49:13 -0400 X-Google-Smtp-Source: ABhQp+T7uA606ky4xYIAT8yQJBu2PfZzgh9ovl2NMtYx5AWfvPwMRZeZFi+AvGqics8//QuOsoI8Kg== Subject: Re: [PATCH net-next] net: dsa: check master device before put To: Vivien Didelot , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Andrew Lunn References: <20171023180141.3674-1-vivien.didelot@savoirfairelinux.com> From: Florian Fainelli Message-ID: Date: Mon, 23 Oct 2017 11:49:08 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20171023180141.3674-1-vivien.didelot@savoirfairelinux.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/23/2017 11:01 AM, Vivien Didelot wrote: > In the case of pdata, the dsa_cpu_parse function calls dev_put() before > making sure it isn't NULL. Fix this. > > Fixes: 71e0bbde0d88 ("net: dsa: Add support for platform data") > Signed-off-by: Vivien Didelot Reviewed-by: Florian Fainelli Did not you want to target 'net' for that though? > --- > net/dsa/dsa2.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c > index 9e8b8aab049d..908c06e32520 100644 > --- a/net/dsa/dsa2.c > +++ b/net/dsa/dsa2.c > @@ -489,14 +489,15 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index, > if (!ethernet) > return -EINVAL; > ethernet_dev = of_find_net_device_by_node(ethernet); > + if (!ethernet_dev) > + return -EPROBE_DEFER; > } else { > ethernet_dev = dsa_dev_to_net_device(ds->cd->netdev[index]); > + if (!ethernet_dev) > + return -EPROBE_DEFER; > dev_put(ethernet_dev); > } > > - if (!ethernet_dev) > - return -EPROBE_DEFER; > - > if (!dst->cpu_dp) { > dst->cpu_dp = port; > dst->cpu_dp->master = ethernet_dev; > -- Florian