]> git.baikalelectronics.ru Git - kernel.git/commit
dccp: put dccp_qpolicy_full() and dccp_qpolicy_push() in the same lock
authorHangyu Hua <hbh25y@gmail.com>
Fri, 29 Jul 2022 11:00:27 +0000 (19:00 +0800)
committerJakub Kicinski <kuba@kernel.org>
Mon, 1 Aug 2022 19:11:56 +0000 (12:11 -0700)
commitef5b8b1023ce1607eb90497fd7cf92e30b79e59e
tree6197eb604669c4bfd619422b6ea9c78ef3cd6f95
parent1056b90d1bb82a7c7a60c88345c0557ff765736e
dccp: put dccp_qpolicy_full() and dccp_qpolicy_push() in the same lock

In the case of sk->dccps_qpolicy == DCCPQ_POLICY_PRIO, dccp_qpolicy_full
will drop a skb when qpolicy is full. And the lock in dccp_sendmsg is
released before sock_alloc_send_skb and then relocked after
sock_alloc_send_skb. The following conditions may lead dccp_qpolicy_push
to add skb to an already full sk_write_queue:

thread1--->lock
thread1--->dccp_qpolicy_full: queue is full. drop a skb
thread1--->unlock
thread2--->lock
thread2--->dccp_qpolicy_full: queue is not full. no need to drop.
thread2--->unlock
thread1--->lock
thread1--->dccp_qpolicy_push: add a skb. queue is full.
thread1--->unlock
thread2--->lock
thread2--->dccp_qpolicy_push: add a skb!
thread2--->unlock

Fix this by moving dccp_qpolicy_full.

Fixes: bc2fb404a31d ("[DCCP]: Set TX Queue Length Bounds via Sysctl")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Link: https://lore.kernel.org/r/20220729110027.40569-1-hbh25y@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/dccp/proto.c