diff mbox series

[4.9,43/90] net: moxa: Fix a potential double free_irq()

Message ID	20200518173500.040306716@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=DMP2=7A=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 43/90] net: moxa: Fix a potential double free_irq() Date: Mon, 18 May 2020 19:36:21 +0200 Message-Id: <20200518173500.040306716@linuxfoundation.org> In-Reply-To: <20200518173450.930655662@linuxfoundation.org> References: <20200518173450.930655662@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.9,02/90] dp83640: reverse arguments to list_add_tail [4.9,03/90] fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks [4.9,04/90] net: macsec: preserve ingress frame ordering [4.9,05/90] net/mlx4_core: Fix use of ENOSPC around mlx4_counter_alloc() [4.9,08/90] sch_sfq: validate silly quantum values [4.9,09/90] bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features(). [4.9,11/90] net/mlx5: Fix command entry leak in Internal Error State [4.9,13/90] Revert "ACPI / video: Add force_native quirk for HP Pavilion dv6" [4.9,15/90] USB: uas: add quirk for LaCie 2Big Quadra [4.9,19/90] batman-adv: fix batadv_nc_random_weight_tq [4.9,20/90] batman-adv: Fix refcnt leak in batadv_show_throughput_override [4.9,23/90] objtool: Fix stack offset tracking for indirect CFAs [4.9,26/90] ext4: add cond_resched() to ext4_protect_reserved_inode [4.9,27/90] net: ipv6: add net argument to ip6_dst_lookup_flow [4.9,28/90] net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup [4.9,30/90] blktrace: fix unlocked access to init/start-stop/teardown [4.9,34/90] ptp: do not explicitly set drvdata in ptp_clock_register() [4.9,36/90] ptp: create "pins" together with the rest of attributes [4.9,38/90] ptp: Fix pass zero to ERR_PTR() in ptp_clock_register [4.9,40/90] ptp: free ptp device pin descriptors properly [4.9,42/90] net/sonic: Fix a resource leak in an error handling path in jazz_sonic_probe() [4.9,43/90] net: moxa: Fix a potential double free_irq() [4.9,44/90] drop_monitor: work around gcc-10 stringop-overflow warning [4.9,46/90] spi: spi-dw: Add lock protect dw_spi rx/tx to prevent concurrent calls [4.9,47/90] cifs: Check for timeout on Negotiate stage [4.9,51/90] ALSA: hda/hdmi: fix race in monitor detection during probe [4.9,54/90] pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler [4.9,57/90] IB/mlx4: Test return value of calls to ib_get_cached_pkey [4.9,59/90] gcc-10 warnings: fix low-hanging fruit [4.9,60/90] kbuild: compute false-positive -Wmaybe-uninitialized cases in Kconfig [4.9,64/90] gcc-10: disable zero-length-bounds warning for now [4.9,65/90] gcc-10: disable array-bounds warning for now [4.9,66/90] gcc-10: disable stringop-overflow warning for now [4.9,68/90] net: fix a potential recursive NETDEV_FEAT_CHANGE [4.9,70/90] Revert "ipv6: add mtu lock check in __ip6_rt_update_pmtu" [4.9,73/90] ALSA: hda/realtek - Limit int mic boost for Thinkpad T530 [4.9,78/90] usb: xhci: Fix NULL pointer dereference when enqueuing trbs from urb sg list [4.9,79/90] ARM: dts: imx27-phytec-phycard-s-rdk: Fix the I2C1 pinctrl entries [4.9,81/90] exec: Move would_dump into flush_old_exec [4.9,83/90] usb: gadget: audio: Fix a missing error return value in audio_bind() [4.9,86/90] Revert "ALSA: hda/realtek: Fix pop noise on ALC225" [4.9,88/90] ARM: dts: r8a7740: Add missing extal2 to CPG node [4.9,89/90] KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce

Commit Message

Greg Kroah-Hartman May 18, 2020, 5:36 p.m. UTC

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

[ Upstream commit ee8d2267f0e39a1bfd95532da3a6405004114b27 ]

Should an irq requested with 'devm_request_irq' be released explicitly,
it should be done by 'devm_free_irq()', not 'free_irq()'.

Fixes: 6c821bd9edc9 ("net: Add MOXA ART SoCs ethernet driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/moxa/moxart_ether.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c
index 0622fd03941b8..6fe61d9343cb8 100644
--- a/drivers/net/ethernet/moxa/moxart_ether.c
+++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -571,7 +571,7 @@  static int moxart_remove(struct platform_device *pdev)
 	struct net_device *ndev = platform_get_drvdata(pdev);
 
 	unregister_netdev(ndev);
-	free_irq(ndev->irq, ndev);
+	devm_free_irq(&pdev->dev, ndev->irq, ndev);
 	moxart_mac_free_memory(ndev);
 	free_netdev(ndev);