| Message ID | 1565554067-4994-1-git-send-email-wenwen@cs.uga.edu |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: ixgbe: fix memory leaks | expand |
On Sun, Aug 11, 2019 at 1:08 PM Wenwen Wang <wenwen@cs.uga.edu> wrote: > > In ixgbe_configure_clsu32(), 'jump', 'input', and 'mask' are allocated > through kzalloc() respectively in a for loop body. Then, > ixgbe_clsu32_build_input() is invoked to build the input. If this process > fails, next iteration of the for loop will be executed. However, the > allocated 'jump', 'input', and 'mask' are not deallocated on this execution > path, leading to memory leaks. > > Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index cbaf712..6b7ea87 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -9490,6 +9490,10 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter, > jump->mat = nexthdr[i].jump; > adapter->jump_tables[link_uhtid] = jump; > break; > + } else { > + kfree(mask); > + kfree(input); > + kfree(jump); > } > } > return 0; So I think this fix is still missing a good chunk of the exception handling it should have. Specifically we will end up failing and then trying to allocate for the next rule. It seems like we should probably stop trying to program rules and unwind the work we have already done. Also it would probably make sense to return an error if we are unable to program one of the rules into the hardware. Otherwise things will fail and the user will never know why.
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Wenwen Wang > Sent: Sunday, August 11, 2019 1:08 PM > To: Wenwen Wang <wenwen@cs.uga.edu> > Cc: open list:NETWORKING DRIVERS <netdev@vger.kernel.org>; moderated > list:INTEL ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org>; open list > <linux-kernel@vger.kernel.org>; David S. Miller <davem@davemloft.net> > Subject: [Intel-wired-lan] [PATCH] net: ixgbe: fix memory leaks > > In ixgbe_configure_clsu32(), 'jump', 'input', and 'mask' are allocated through > kzalloc() respectively in a for loop body. Then, > ixgbe_clsu32_build_input() is invoked to build the input. If this process fails, > next iteration of the for loop will be executed. However, the allocated > 'jump', 'input', and 'mask' are not deallocated on this execution path, leading > to memory leaks. > > Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++++ > 1 file changed, 4 insertions(+) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index cbaf712..6b7ea87 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9490,6 +9490,10 @@ static int ixgbe_configure_clsu32(struct ixgbe_adapter *adapter, jump->mat = nexthdr[i].jump; adapter->jump_tables[link_uhtid] = jump; break; + } else { + kfree(mask); + kfree(input); + kfree(jump); } } return 0;
In ixgbe_configure_clsu32(), 'jump', 'input', and 'mask' are allocated through kzalloc() respectively in a for loop body. Then, ixgbe_clsu32_build_input() is invoked to build the input. If this process fails, next iteration of the for loop will be executed. However, the allocated 'jump', 'input', and 'mask' are not deallocated on this execution path, leading to memory leaks. Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++++ 1 file changed, 4 insertions(+)