Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdd5f43a authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

selftests: psock_tpacket: fix status check 



Testing like this for TP_STATUS_AVAILABLE clearly is a stupid bug
since it always returns true. Fix this by only checking for flags
where the kernel owns the packet and negate this result, since we
also could run into the non-zero status TP_STATUS_WRONG_FORMAT
and need to reclaim frames.

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 823aa873

tools/testing/selftests/net/psock_tpacket.c

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static void walk_v1_v2_rx(int sock, struct ring *ring) 


static inline int __v1_tx_kernel_ready(struct tpacket_hdr *hdr)

{

	return ((hdr->tp_status & TP_STATUS_AVAILABLE) == TP_STATUS_AVAILABLE);

	return !(hdr->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING));

}



static inline void __v1_tx_user_ready(struct tpacket_hdr *hdr)
@@ -311,7 +311,7 @@ static inline void __v1_tx_user_ready(struct tpacket_hdr *hdr) 


static inline int __v2_tx_kernel_ready(struct tpacket2_hdr *hdr)

{

	return ((hdr->tp_status & TP_STATUS_AVAILABLE) == TP_STATUS_AVAILABLE);

	return !(hdr->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING));

}



static inline void __v2_tx_user_ready(struct tpacket2_hdr *hdr)