From: Wen Yang <wen.yang99@zte.com.cn> To: linus.walleij@linaro.org Cc: andrew@lunn.ch, vivien.didelot@gmail.com, f.fainelli@gmail.com, davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexandre.belloni@bootlin.com, UNGLinuxDriver@microchip.com, nbd@nbd.name, lorenzo.bianconi83@gmail.com, kvalo@codeaurora.org, matthias.bgg@gmail.com, linux-wireless@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, anirudh@xilinx.com, John.Linn@xilinx.com, michal.simek@xilinx.com, wang.yi59@zte.com.cn, Wen Yang <wen.yang99@zte.com.cn> Subject: [PATCH 5/5] net: dsa: fix a leaked reference by adding missing of_node_put Date: Fri, 22 Feb 2019 15:15:42 +0800 [thread overview] Message-ID: <1550819742-32155-5-git-send-email-wen.yang99@zte.com.cn> (raw) In-Reply-To: <1550819742-32155-1-git-send-email-wen.yang99@zte.com.cn> The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. Detected by coccinelle with the following warnings: ./net/dsa/port.c:294:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 284, but without a corresponding object release within this function. ./net/dsa/dsa2.c:627:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. ./net/dsa/dsa2.c:630:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. ./net/dsa/dsa2.c:636:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. ./net/dsa/dsa2.c:639:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. Signed-off-by: Wen Yang <wen.yang99@zte.com.cn> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Vivien Didelot <vivien.didelot@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- net/dsa/dsa2.c | 16 ++++++++++------ net/dsa/port.c | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 8c431e0..89823f0 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -613,7 +613,7 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds, struct device_node *ports, *port; struct dsa_port *dp; u32 reg; - int err; + int err = 0; ports = of_get_child_by_name(dn, "ports"); if (!ports) { @@ -624,19 +624,23 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds, for_each_available_child_of_node(ports, port) { err = of_property_read_u32(port, "reg", ®); if (err) - return err; + goto out_put_node; - if (reg >= ds->num_ports) - return -EINVAL; + if (reg >= ds->num_ports) { + err = -EINVAL; + goto out_put_node; + } dp = &ds->ports[reg]; err = dsa_port_parse_of(dp, port); if (err) - return err; + goto out_put_node; } - return 0; +out_put_node: + of_node_put(ports); + return err; } static int dsa_switch_parse_member_of(struct dsa_switch *ds, diff --git a/net/dsa/port.c b/net/dsa/port.c index 2d7e01b..a6d9a04 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -291,6 +291,7 @@ static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp) return ERR_PTR(-EPROBE_DEFER); } + of_node_put(phy_dn); return phydev; } -- 2.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Wen Yang <wen.yang99@zte.com.cn> To: linus.walleij@linaro.org Cc: wang.yi59@zte.com.cn, andrew@lunn.ch, alexandre.belloni@bootlin.com, f.fainelli@gmail.com, michal.simek@xilinx.com, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, Wen Yang <wen.yang99@zte.com.cn>, matthias.bgg@gmail.com, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, anirudh@xilinx.com, lorenzo.bianconi83@gmail.com, UNGLinuxDriver@microchip.com, John.Linn@xilinx.com, vivien.didelot@gmail.com, kvalo@codeaurora.org, nbd@nbd.name Subject: [PATCH 5/5] net: dsa: fix a leaked reference by adding missing of_node_put Date: Fri, 22 Feb 2019 15:15:42 +0800 [thread overview] Message-ID: <1550819742-32155-5-git-send-email-wen.yang99@zte.com.cn> (raw) In-Reply-To: <1550819742-32155-1-git-send-email-wen.yang99@zte.com.cn> The call to of_parse_phandle returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. Detected by coccinelle with the following warnings: ./net/dsa/port.c:294:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 284, but without a corresponding object release within this function. ./net/dsa/dsa2.c:627:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. ./net/dsa/dsa2.c:630:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. ./net/dsa/dsa2.c:636:3-9: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. ./net/dsa/dsa2.c:639:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 618, but without a corresponding object release within this function. Signed-off-by: Wen Yang <wen.yang99@zte.com.cn> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Vivien Didelot <vivien.didelot@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- net/dsa/dsa2.c | 16 ++++++++++------ net/dsa/port.c | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 8c431e0..89823f0 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -613,7 +613,7 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds, struct device_node *ports, *port; struct dsa_port *dp; u32 reg; - int err; + int err = 0; ports = of_get_child_by_name(dn, "ports"); if (!ports) { @@ -624,19 +624,23 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds, for_each_available_child_of_node(ports, port) { err = of_property_read_u32(port, "reg", ®); if (err) - return err; + goto out_put_node; - if (reg >= ds->num_ports) - return -EINVAL; + if (reg >= ds->num_ports) { + err = -EINVAL; + goto out_put_node; + } dp = &ds->ports[reg]; err = dsa_port_parse_of(dp, port); if (err) - return err; + goto out_put_node; } - return 0; +out_put_node: + of_node_put(ports); + return err; } static int dsa_switch_parse_member_of(struct dsa_switch *ds, diff --git a/net/dsa/port.c b/net/dsa/port.c index 2d7e01b..a6d9a04 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -291,6 +291,7 @@ static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp) return ERR_PTR(-EPROBE_DEFER); } + of_node_put(phy_dn); return phydev; } -- 2.9.5 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-02-22 7:16 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-22 7:15 [PATCH 1/5] net: dsa: fix a leaked reference by adding a missing of_node_put Wen Yang 2019-02-22 7:15 ` Wen Yang 2019-02-22 7:15 ` [PATCH 2/5] net: mscc: ocelot: " Wen Yang 2019-02-22 7:15 ` Wen Yang 2019-02-22 7:15 ` Wen Yang 2019-02-22 7:15 ` [PATCH 3/5] mt76: " Wen Yang 2019-02-22 7:15 ` Wen Yang 2019-02-28 8:39 ` Kalle Valo 2019-02-28 8:39 ` Kalle Valo 2019-02-28 8:39 ` Kalle Valo 2019-02-28 8:39 ` Kalle Valo 2019-04-05 13:15 ` Markus Elfring 2019-04-05 13:15 ` Markus Elfring [not found] ` <799adbb0-23a6-bf20-f22d-4af68e9d0012-S0/GAf8tV78@public.gmane.org> 2019-04-08 6:55 ` [PATCH 3/5] mt76: fix a leaked reference by adding a missingof_node_put wen.yang99-Th6q7B73Y6EnDS1+zs4M5A 2019-04-08 7:37 ` Markus Elfring 2019-04-08 7:37 ` Markus Elfring 2019-02-22 7:15 ` [PATCH 4/5] net: xilinx: fix a leaked reference by adding missing of_node_put Wen Yang 2019-02-22 7:15 ` Wen Yang 2019-02-22 7:15 ` Wen Yang 2019-02-22 7:15 ` Wen Yang [this message] 2019-02-22 7:15 ` [PATCH 5/5] net: dsa: " Wen Yang 2019-02-24 20:32 ` David Miller 2019-02-24 20:32 ` David Miller 2019-02-22 10:38 ` [PATCH 1/5] net: dsa: fix a leaked reference by adding a " Linus Walleij 2019-02-22 10:38 ` Linus Walleij 2019-02-22 10:38 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1550819742-32155-5-git-send-email-wen.yang99@zte.com.cn \ --to=wen.yang99@zte.com.cn \ --cc=John.Linn@xilinx.com \ --cc=UNGLinuxDriver@microchip.com \ --cc=alexandre.belloni@bootlin.com \ --cc=andrew@lunn.ch \ --cc=anirudh@xilinx.com \ --cc=davem@davemloft.net \ --cc=f.fainelli@gmail.com \ --cc=kvalo@codeaurora.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ --cc=lorenzo.bianconi83@gmail.com \ --cc=matthias.bgg@gmail.com \ --cc=michal.simek@xilinx.com \ --cc=nbd@nbd.name \ --cc=netdev@vger.kernel.org \ --cc=vivien.didelot@gmail.com \ --cc=wang.yi59@zte.com.cn \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.