RDMA/rxe: Fix coding error in rxe_rcv_mcast_pkt
Subsystems (2)
PATCH 1/1 RDMA/rxe: Fix coding error in rxe_rcv_mcast_pkt
rxe_rcv_mcast_pkt() in rxe_recv.c can leak SKBs in error path code. The loop over the QPs attached to a multicast group creates new cloned SKBs for all but the last QP in the list and passes the SKB and its clones to rxe_rcv_pkt() for further processing. Any QPs that do not pass some checks are skipped. If the last QP in the list fails the tests the SKB is leaked. This patch checks if the SKB for the last QP was used and if not frees it. Also removes a redundant loop invariant assignment.
--- drivers/infiniband/sw/rxe/rxe_recv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/infiniband/sw/rxe/rxe_recv.c +11 -7
@@ -252,7 +252,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)list_for_each_entry (mce, &mcg->qp_list, qp_list) { qp = mce->qp; - pkt =SKB_TO_PKT (skb);/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);
@@ -264,12 +263,18 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)continue ;/* for all but the last qp create a new clone of the -* skb and pass to the qp. +* skb and pass to the qp. If an error occurs in the +* checks for the last qp in the list we need to +* free the skb since it hasn't been passed on to +* rxe_rcv_pkt() which would free it later. */ -if (mce->qp_list.next != &mcg->qp_list) +if (mce->qp_list.next != &mcg->qp_list) { per_qp_skb =skb_clone (skb,GFP_ATOMIC ); -else + }else { per_qp_skb = skb; +/* show we have consumed the skb */ + skb =NULL ; + }if (unlikely (!per_qp_skb))continue ;
@@ -284,10 +289,9 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ -return ; - err1: -kfree_skb (skb); +if (skb) +kfree_skb (skb); }/**
Signature · 1 line
2.27.0
Zhu Yanjun
maintainerQuoted 52 lines · Bob Pearson
rxe_rcv_mcast_pkt()inrxe_recv.ccan leak SKBs in error path code. The loop over the QPs attached to a multicast group creates new cloned SKBs for all but the last QP in the list and passes the SKB and its clones torxe_rcv_pkt()for further processing. Any QPs that do not pass some checks are skipped. If the last QP in the list fails the tests the SKB is leaked. This patch checks if the SKB for the last QP was used and if not frees it. Also removes a redundant loop invariant assignment.Fixes 8700e3e7c4857 ("Soft RoCE driver")Fixes 71abf20b28ff8 ("RDMA/rxe: Handle skb_clone() failure in rxe_recv.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_recv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/infiniband/sw/rxe/rxe_recv.c +9
-4@@ -252,7 +252,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)list_for_each_entry (mce, &mcg->qp_list, qp_list) { qp = mce->qp; - pkt =SKB_TO_PKT (skb);/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);@@ -264,12 +263,18 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)continue ;/* for all but the last qp create a new clone of the -* skb and pass to the qp. +* skb and pass to the qp. If an error occurs in the +* checks for the last qp in the list we need to +* free the skb since it hasn't been passed on to +* rxe_rcv_pkt() which would free it later. */ -if (mce->qp_list.next != &mcg->qp_list) +if (mce->qp_list.next != &mcg->qp_list) { per_qp_skb =skb_clone (skb,GFP_ATOMIC ); -else + }else { per_qp_skb = skb; +/* show we have consumed the skb */ + skb =NULL ; + }if (unlikely (!per_qp_skb))continue ;
drivers/infiniband/sw/rxe/rxe_recv.c static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) · line 294
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_recv.c +2
-3@@ -284,10 +289,9 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ -return ; - err1: -kfree_skb (skb); +if (skb) +kfree_skb (skb);
"if (skb)" is not needed here.
The implemetation of kfree_skb:
void kfree_skb(struct sk_buff *skb)
{
if (unlikely(!skb))
return;
if (likely(atomic_read(&skb->users) == 1)) smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users))) return;trace_kfree_skb(skb, __builtin_return_address(0)); __kfree_skb(skb);
}
Zhu Yanjun
Quoted 6 lines
drivers/infiniband/sw/rxe/rxe_recv.c +0
-1}/** -- 2.27.0
Quoted 79 lines · Zhu Yanjun
Quoted 52 lines · Bob Pearson
rxe_rcv_mcast_pkt()inrxe_recv.ccan leak SKBs in error path code. The loop over the QPs attached to a multicast group creates new cloned SKBs for all but the last QP in the list and passes the SKB and its clones torxe_rcv_pkt()for further processing. Any QPs that do not pass some checks are skipped. If the last QP in the list fails the tests the SKB is leaked. This patch checks if the SKB for the last QP was used and if not frees it. Also removes a redundant loop invariant assignment.Fixes 8700e3e7c4857 ("Soft RoCE driver")Fixes 71abf20b28ff8 ("RDMA/rxe: Handle skb_clone() failure in rxe_recv.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_recv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/infiniband/sw/rxe/rxe_recv.c +9
-4@@ -252,7 +252,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)list_for_each_entry (mce, &mcg->qp_list, qp_list) { qp = mce->qp; - pkt =SKB_TO_PKT (skb);/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);@@ -264,12 +263,18 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)continue ;/* for all but the last qp create a new clone of the -* skb and pass to the qp. +* skb and pass to the qp. If an error occurs in the +* checks for the last qp in the list we need to +* free the skb since it hasn't been passed on to +* rxe_rcv_pkt() which would free it later. */ -if (mce->qp_list.next != &mcg->qp_list) +if (mce->qp_list.next != &mcg->qp_list) { per_qp_skb =skb_clone (skb,GFP_ATOMIC ); -else + }else { per_qp_skb = skb; +/* show we have consumed the skb */ + skb =NULL ; + }if (unlikely (!per_qp_skb))continue ;drivers/infiniband/sw/rxe/rxe_recv.c static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) · line 294
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_recv.c +2
-3@@ -284,10 +289,9 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ -return ; - err1: -kfree_skb (skb); +if (skb) +kfree_skb (skb);"if (skb)" is not needed here.
The implemetation of
kfree_skb:void
kfree_skb(struct sk_buff *skb)
{
if (unlikely(!skb))
return;
if (likely(atomic_read(&skb->users) == 1))smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users))) return;trace_kfree_skb(skb, __builtin_return_address(0));__kfree_skb(skb);
}
Quoted 7 lines
Zhu Yanjun
Quoted 6 lines
drivers/infiniband/sw/rxe/rxe_recv.c +0
-1}/** -- 2.27.0
Agreed but the reason I wrote that was to make it obvious why I set skb to NULL above. But as long as it is clear without it I can remove the test.
Quoted 80 lines · Bob Pearson
Quoted 79 lines · Zhu Yanjun
Quoted 52 lines · Bob Pearson
rxe_rcv_mcast_pkt()inrxe_recv.ccan leak SKBs in error path code. The loop over the QPs attached to a multicast group creates new cloned SKBs for all but the last QP in the list and passes the SKB and its clones torxe_rcv_pkt()for further processing. Any QPs that do not pass some checks are skipped. If the last QP in the list fails the tests the SKB is leaked. This patch checks if the SKB for the last QP was used and if not frees it. Also removes a redundant loop invariant assignment.Fixes 8700e3e7c4857 ("Soft RoCE driver")Fixes 71abf20b28ff8 ("RDMA/rxe: Handle skb_clone() failure in rxe_recv.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_recv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/infiniband/sw/rxe/rxe_recv.c +9
-4@@ -252,7 +252,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)list_for_each_entry (mce, &mcg->qp_list, qp_list) { qp = mce->qp; - pkt =SKB_TO_PKT (skb);/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);@@ -264,12 +263,18 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)continue ;/* for all but the last qp create a new clone of the -* skb and pass to the qp. +* skb and pass to the qp. If an error occurs in the +* checks for the last qp in the list we need to +* free the skb since it hasn't been passed on to +* rxe_rcv_pkt() which would free it later. */ -if (mce->qp_list.next != &mcg->qp_list) +if (mce->qp_list.next != &mcg->qp_list) { per_qp_skb =skb_clone (skb,GFP_ATOMIC ); -else + }else { per_qp_skb = skb; +/* show we have consumed the skb */ + skb =NULL ; + }if (unlikely (!per_qp_skb))continue ;drivers/infiniband/sw/rxe/rxe_recv.c static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) · line 294
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_recv.c +2
-3@@ -284,10 +289,9 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ -return ; - err1: -kfree_skb (skb); +if (skb) +kfree_skb (skb);"if (skb)" is not needed here.
The implemetation of
kfree_skb:void
kfree_skb(struct sk_buff *skb)
{
if (unlikely(!skb))
return;
if (likely(atomic_read(&skb->users) == 1))smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users))) return;trace_kfree_skb(skb, __builtin_return_address(0));__kfree_skb(skb);
}
Quoted 9 lines
Quoted 7 lines
Zhu Yanjun
Quoted 6 lines
drivers/infiniband/sw/rxe/rxe_recv.c +0
-1}/** -- 2.27.0
Agreed but the reason I wrote that was to make it obvious why I set skb to NULL above. But as long as it is clear without it I can remove the test.
Actually I should have written
if (unlikely(skb))
kfree_skb(skb);
Zhu Yanjun
maintainerQuoted 89 lines · Bob Pearson
Quoted 87 lines · Bob Pearson
Quoted 86 lines · Zhu Yanjun
Quoted 52 lines · Bob Pearson
rxe_rcv_mcast_pkt()inrxe_recv.ccan leak SKBs in error path code. The loop over the QPs attached to a multicast group creates new cloned SKBs for all but the last QP in the list and passes the SKB and its clones torxe_rcv_pkt()for further processing. Any QPs that do not pass some checks are skipped. If the last QP in the list fails the tests the SKB is leaked. This patch checks if the SKB for the last QP was used and if not frees it. Also removes a redundant loop invariant assignment.Fixes 8700e3e7c4857 ("Soft RoCE driver")Fixes 71abf20b28ff8 ("RDMA/rxe: Handle skb_clone() failure in rxe_recv.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_recv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/infiniband/sw/rxe/rxe_recv.c +9
-4@@ -252,7 +252,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)list_for_each_entry (mce, &mcg->qp_list, qp_list) { qp = mce->qp; - pkt =SKB_TO_PKT (skb);/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);@@ -264,12 +263,18 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)continue ;/* for all but the last qp create a new clone of the -* skb and pass to the qp. +* skb and pass to the qp. If an error occurs in the +* checks for the last qp in the list we need to +* free the skb since it hasn't been passed on to +* rxe_rcv_pkt() which would free it later. */ -if (mce->qp_list.next != &mcg->qp_list) +if (mce->qp_list.next != &mcg->qp_list) { per_qp_skb =skb_clone (skb,GFP_ATOMIC ); -else + }else { per_qp_skb = skb; +/* show we have consumed the skb */ + skb =NULL ; + }if (unlikely (!per_qp_skb))continue ;drivers/infiniband/sw/rxe/rxe_recv.c static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) · line 294
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_recv.c +2
-3@@ -284,10 +289,9 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ -return ; - err1: -kfree_skb (skb); +if (skb) +kfree_skb (skb);"if (skb)" is not needed here.
The implemetation of
kfree_skb:void
kfree_skb(struct sk_buff *skb)
{
if (unlikely(!skb))
return;
if (likely(atomic_read(&skb->users) == 1))smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users))) return;trace_kfree_skb(skb, __builtin_return_address(0));__kfree_skb(skb);
}Zhu Yanjun
Quoted 6 lines
drivers/infiniband/sw/rxe/rxe_recv.c +0
-1}/** -- 2.27.0
Quoted 6 lines
Quoted 2 lines
Agreed but the reason I wrote that was to make it obvious why I set skb to NULL above. But as long as it is clear without it I can remove the test.
Actually I should have written
if (unlikely(skb))
kfree_skb(skb);
This is not in fast path. It is in error handling. Not sure if this can make big optimizations.
Zhu Yanjun
Quoted 2 lines
Quoted 88 lines · Bob Pearson
Quoted 87 lines · Bob Pearson
Quoted 86 lines · Zhu Yanjun
Quoted 52 lines · Bob Pearson
rxe_rcv_mcast_pkt()inrxe_recv.ccan leak SKBs in error path code. The loop over the QPs attached to a multicast group creates new cloned SKBs for all but the last QP in the list and passes the SKB and its clones torxe_rcv_pkt()for further processing. Any QPs that do not pass some checks are skipped. If the last QP in the list fails the tests the SKB is leaked. This patch checks if the SKB for the last QP was used and if not frees it. Also removes a redundant loop invariant assignment.Fixes 8700e3e7c4857 ("Soft RoCE driver")Fixes 71abf20b28ff8 ("RDMA/rxe: Handle skb_clone() failure in rxe_recv.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_recv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/infiniband/sw/rxe/rxe_recv.c +9
-4@@ -252,7 +252,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)list_for_each_entry (mce, &mcg->qp_list, qp_list) { qp = mce->qp; - pkt =SKB_TO_PKT (skb);/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);@@ -264,12 +263,18 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)continue ;/* for all but the last qp create a new clone of the -* skb and pass to the qp. +* skb and pass to the qp. If an error occurs in the +* checks for the last qp in the list we need to +* free the skb since it hasn't been passed on to +* rxe_rcv_pkt() which would free it later. */ -if (mce->qp_list.next != &mcg->qp_list) +if (mce->qp_list.next != &mcg->qp_list) { per_qp_skb =skb_clone (skb,GFP_ATOMIC ); -else + }else { per_qp_skb = skb; +/* show we have consumed the skb */ + skb =NULL ; + }if (unlikely (!per_qp_skb))continue ;drivers/infiniband/sw/rxe/rxe_recv.c static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) · line 294
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_recv.c +2
-3@@ -284,10 +289,9 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ -return ; - err1: -kfree_skb (skb); +if (skb) +kfree_skb (skb);"if (skb)" is not needed here.
The implemetation of
kfree_skb:void
kfree_skb(struct sk_buff *skb)
{
if (unlikely(!skb))
return;
if (likely(atomic_read(&skb->users) == 1))smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users))) return;trace_kfree_skb(skb, __builtin_return_address(0));__kfree_skb(skb);
}Zhu Yanjun
Quoted 6 lines
drivers/infiniband/sw/rxe/rxe_recv.c +0
-1}/** -- 2.27.0
Quoted 6 lines
Quoted 2 lines
Agreed but the reason I wrote that was to make it obvious why I set skb to NULL above. But as long as it is clear without it I can remove the test.
Actually I should have written
if (unlikely(skb))
kfree_skb(skb);
Please don't put "if (a) kfree(a);" constructions unless you want to deal with daily flux of patches with attempt to remove "if".
Thanks
Quoted 2 lines
Quoted 93 lines · Leon Romanovsky
Quoted 92 lines · Bob Pearson
Quoted 80 lines · Bob Pearson
Quoted 79 lines · Zhu Yanjun
Quoted 52 lines · Bob Pearson
rxe_rcv_mcast_pkt()inrxe_recv.ccan leak SKBs in error path code. The loop over the QPs attached to a multicast group creates new cloned SKBs for all but the last QP in the list and passes the SKB and its clones torxe_rcv_pkt()for further processing. Any QPs that do not pass some checks are skipped. If the last QP in the list fails the tests the SKB is leaked. This patch checks if the SKB for the last QP was used and if not frees it. Also removes a redundant loop invariant assignment.Fixes 8700e3e7c4857 ("Soft RoCE driver")Fixes 71abf20b28ff8 ("RDMA/rxe: Handle skb_clone() failure in rxe_recv.c")Signed-off-by Bob Pearson <[email protected]>--- drivers/infiniband/sw/rxe/rxe_recv.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/infiniband/sw/rxe/rxe_recv.c +9
-4@@ -252,7 +252,6 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)list_for_each_entry (mce, &mcg->qp_list, qp_list) { qp = mce->qp; - pkt =SKB_TO_PKT (skb);/* validate qp for incoming packet */ err =check_type_state (rxe, pkt, qp);@@ -264,12 +263,18 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)continue ;/* for all but the last qp create a new clone of the -* skb and pass to the qp. +* skb and pass to the qp. If an error occurs in the +* checks for the last qp in the list we need to +* free the skb since it hasn't been passed on to +* rxe_rcv_pkt() which would free it later. */ -if (mce->qp_list.next != &mcg->qp_list) +if (mce->qp_list.next != &mcg->qp_list) { per_qp_skb =skb_clone (skb,GFP_ATOMIC ); -else + }else { per_qp_skb = skb; +/* show we have consumed the skb */ + skb =NULL ; + }if (unlikely (!per_qp_skb))continue ;drivers/infiniband/sw/rxe/rxe_recv.c static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) · line 294
Quoted 9 lines
drivers/infiniband/sw/rxe/rxe_recv.c +2
-3@@ -284,10 +289,9 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb)rxe_drop_ref (mcg);/* drop ref from rxe_pool_get_key. */ -return ; - err1: -kfree_skb (skb); +if (skb) +kfree_skb (skb);"if (skb)" is not needed here.
The implemetation of
kfree_skb:void
kfree_skb(struct sk_buff *skb)
{
if (unlikely(!skb))
return;
if (likely(atomic_read(&skb->users) == 1))smp_rmb();
else if (likely(!atomic_dec_and_test(&skb->users))) return;trace_kfree_skb(skb, __builtin_return_address(0));__kfree_skb(skb);
}Quoted 9 lines
Quoted 7 lines
Zhu Yanjun
Quoted 6 lines
drivers/infiniband/sw/rxe/rxe_recv.c +0
-1}/** -- 2.27.0
Agreed but the reason I wrote that was to make it obvious why I set skb to NULL above. But as long as it is clear without it I can remove the test.
Actually I should have written
Quoted 10 lines
Quoted 2 lines
if (unlikely(skb))
kfree_skb(skb);Please don't put "if (a) kfree(a);" constructions unless you want to deal with daily flux of patches with attempt to remove "if".
Thanks
Quoted 2 lines
Yes I get it. Thanks. -- bob