From: Paolo Abeni <pabeni@redhat.com>
To: Nick Child <nnac123@linux.ibm.com>, netdev@vger.kernel.org
Cc: nick.child@ibm.com, haren@linux.ibm.com, ricklind@us.ibm.com
Subject: Re: [PATCH net 1/2] ibmvnic: Add tx check to prevent skb leak
Date: Tue, 25 Jun 2024 10:58:14 +0200 [thread overview]
Message-ID: <94929c563aae0f84c4a75d214f329db048ee4763.camel@redhat.com> (raw)
In-Reply-To: <20240620152312.1032323-2-nnac123@linux.ibm.com>
On Thu, 2024-06-20 at 10:23 -0500, Nick Child wrote:
> Below is a summary of how the driver stores a reference to an skb during
> transmit:
> tx_buff[free_map[consumer_index]]->skb = new_skb;
> free_map[consumer_index] = IBMVNIC_INVALID_MAP;
> consumer_index ++;
> Where variable data looks like this:
> free_map == [4, IBMVNIC_INVALID_MAP, IBMVNIC_INVALID_MAP, 0, 3]
> consumer_index^
> tx_buff == [skb=null, skb=<ptr>, skb=<ptr>, skb=null, skb=null]
>
> The driver has checks to ensure that free_map[consumer_index] pointed to
> a valid index but there was no check to ensure that this index pointed
> to an unused/null skb address. So, if, by some chance, our free_map and
> tx_buff lists become out of sync then we were previously risking an
> skb memory leak. This could then cause tcp congestion control to stop
> sending packets, eventually leading to ETIMEDOUT.
>
> Therefore, add a conditional to ensure that the skb address is null. If
> not then warn the user (because this is still a bug that should be
> patched) and free the old pointer to prevent memleak/tcp problems.
>
> Signed-off-by: Nick Child <nnac123@linux.ibm.com>
> ---
> drivers/net/ethernet/ibm/ibmvnic.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index 5e9a93bdb518..887d92a88403 100644
For some reasons, this one was not applied together with patch 2/2.
I'm applying it now.
Cheers,
Paolo
next prev parent reply other threads:[~2024-06-25 8:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 15:23 [PATCH net 0/2] ibmvnic: Fix TX skb leak after device reset Nick Child
2024-06-20 15:23 ` [PATCH net 1/2] ibmvnic: Add tx check to prevent skb leak Nick Child
2024-06-25 8:58 ` Paolo Abeni [this message]
2024-06-20 15:23 ` [PATCH net 2/2] ibmvnic: Free any outstanding tx skbs during scrq reset Nick Child
2024-06-22 10:40 ` [PATCH net 0/2] ibmvnic: Fix TX skb leak after device reset patchwork-bot+netdevbpf
2024-06-25 9:10 ` patchwork-bot+netdevbpf
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=94929c563aae0f84c4a75d214f329db048ee4763.camel@redhat.com \
--to=pabeni@redhat.com \
--cc=haren@linux.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=nick.child@ibm.com \
--cc=nnac123@linux.ibm.com \
--cc=ricklind@us.ibm.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).