Xuan Zhuo
2022-Aug-04 06:32 UTC
[PATCH net] virtio_net: fix memory leak inside XPD_TX with mergeable
When we call xdp_convert_buff_to_frame() to get xdpf, if it returns
NULL, we should check if xdp_page was allocated by xdp_linearize_page().
If it is newly allocated, it should be freed here alone. Just like any
other "goto err_xdp".
Fixes: 44fa2dbd4759 ("xdp: transition into using xdp_frame for
ndo_xdp_xmit")
Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com>
---
drivers/net/virtio_net.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index ec8e1b3108c3..3b3eebad3977 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1057,8 +1057,11 @@ static struct sk_buff *receive_mergeable(struct
net_device *dev,
case XDP_TX:
stats->xdp_tx++;
xdpf = xdp_convert_buff_to_frame(&xdp);
- if (unlikely(!xdpf))
+ if (unlikely(!xdpf)) {
+ if (unlikely(xdp_page != page))
+ put_page(xdp_page);
goto err_xdp;
+ }
err = virtnet_xdp_xmit(dev, 1, &xdpf, 0);
if (unlikely(!err)) {
xdp_return_frame_rx_napi(xdpf);
--
2.31.0
Jason Wang
2022-Aug-04 07:35 UTC
[PATCH net] virtio_net: fix memory leak inside XPD_TX with mergeable
On Thu, Aug 4, 2022 at 2:33 PM Xuan Zhuo <xuanzhuo at linux.alibaba.com> wrote:> > When we call xdp_convert_buff_to_frame() to get xdpf, if it returns > NULL, we should check if xdp_page was allocated by xdp_linearize_page(). > If it is newly allocated, it should be freed here alone. Just like any > other "goto err_xdp". > > Fixes: 44fa2dbd4759 ("xdp: transition into using xdp_frame for ndo_xdp_xmit") > Signed-off-by: Xuan Zhuo <xuanzhuo at linux.alibaba.com>Acked-by: Jason Wang <jasowang at redhat.com>> --- > drivers/net/virtio_net.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index ec8e1b3108c3..3b3eebad3977 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1057,8 +1057,11 @@ static struct sk_buff *receive_mergeable(struct net_device *dev, > case XDP_TX: > stats->xdp_tx++; > xdpf = xdp_convert_buff_to_frame(&xdp); > - if (unlikely(!xdpf)) > + if (unlikely(!xdpf)) { > + if (unlikely(xdp_page != page)) > + put_page(xdp_page); > goto err_xdp; > + } > err = virtnet_xdp_xmit(dev, 1, &xdpf, 0); > if (unlikely(!err)) { > xdp_return_frame_rx_napi(xdpf); > -- > 2.31.0 >