| Message ID | 20180509135848.20530-1-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | ixgbe: fix memory leak on ipsec allocation | expand |
On 5/9/2018 6:58 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The error clean up path kfree's adapter->ipsec and should be > instead kfree'ing ipsec. Fix this. Also, the err1 error exit path > does not need to kfree ipsec because this failure path was for > the failed allocation of ipsec. > > Detected by CoverityScan, CID#146424 ("Resource Leak") > > Fixes: 63a67fe229ea ("ixgbe: add ipsec offload add and remove SA") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Yep, thanks, good catch. Acked-by: Shannon Nelson <shannon.nelson@oracle.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c > index 41af2b81e960..195c0b65eee2 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c > @@ -919,8 +919,8 @@ void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter) > kfree(ipsec->ip_tbl); > kfree(ipsec->rx_tbl); > kfree(ipsec->tx_tbl); > + kfree(ipsec); > err1: > - kfree(adapter->ipsec); > netdev_err(adapter->netdev, "Unable to allocate memory for SA tables"); > } > >
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Colin King > Sent: Wednesday, May 9, 2018 6:59 AM > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; David S . Miller > <davem@davemloft.net>; intel-wired-lan@lists.osuosl.org; > netdev@vger.kernel.org > Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [Intel-wired-lan] [PATCH] ixgbe: fix memory leak on ipsec allocation > > From: Colin Ian King <colin.king@canonical.com> > > The error clean up path kfree's adapter->ipsec and should be instead > kfree'ing ipsec. Fix this. Also, the err1 error exit path does not need to kfree > ipsec because this failure path was for the failed allocation of ipsec. > > Detected by CoverityScan, CID#146424 ("Resource Leak") > > Fixes: 63a67fe229ea ("ixgbe: add ipsec offload add and remove SA") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c index 41af2b81e960..195c0b65eee2 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c @@ -919,8 +919,8 @@ void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter) kfree(ipsec->ip_tbl); kfree(ipsec->rx_tbl); kfree(ipsec->tx_tbl); + kfree(ipsec); err1: - kfree(adapter->ipsec); netdev_err(adapter->netdev, "Unable to allocate memory for SA tables"); }