• Kuniyuki Iwashima's avatar
    af_unix: Don't stop recv() at consumed ex-OOB skb. · 36893ef0
    Kuniyuki Iwashima authored
    Currently, recv() is stopped at a consumed OOB skb even if a new
    OOB skb is queued and we can ignore the old OOB skb.
    
      >>> from socket import *
      >>> c1, c2 = socket(AF_UNIX, SOCK_STREAM)
      >>> c1.send(b'hellowor', MSG_OOB)
      8
      >>> c2.recv(1, MSG_OOB)  # consume OOB data stays at middle of recvq.
      b'r'
      >>> c1.send(b'ld', MSG_OOB)
      2
      >>> c2.recv(10)          # recv() stops at the old consumed OOB
      b'hellowo'               # should be 'hellowol'
    
    manage_oob() should not stop recv() at the old consumed OOB skb if
    there is a new OOB data queued.
    
    Note that TCP behaviour is apparently wrong in this test case because
    we can recv() the same OOB data twice.
    
    Without fix:
    
      #  RUN           msg_oob.no_peek.ex_oob_ahead_break ...
      # msg_oob.c:138:ex_oob_ahead_break:AF_UNIX :hellowo
      # msg_oob.c:139:ex_oob_ahead_break:Expected:hellowol
      # msg_oob.c:141:ex_oob_ahead_break:Expected ret[0] (7) == expected_len (8)
      # ex_oob_ahead_break: Test terminated by assertion
      #          FAIL  msg_oob.no_peek.ex_oob_ahead_break
      not ok 11 msg_oob.no_peek.ex_oob_ahead_break
    
    With fix:
    
      #  RUN           msg_oob.no_peek.ex_oob_ahead_break ...
      # msg_oob.c:146:ex_oob_ahead_break:AF_UNIX :hellowol
      # msg_oob.c:147:ex_oob_ahead_break:TCP     :helloworl
      #            OK  msg_oob.no_peek.ex_oob_ahead_break
      ok 11 msg_oob.no_peek.ex_oob_ahead_break
    
    Fixes: 314001f0 ("af_unix: Add OOB support")
    Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
    Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
    36893ef0
af_unix.c 87.3 KB