• Kuniyuki Iwashima's avatar
    kcm: Fix error handling for SOCK_DGRAM in kcm_sendmsg(). · a22730b1
    Kuniyuki Iwashima authored
    syzkaller found a memory leak in kcm_sendmsg(), and commit c821a88b
    ("kcm: Fix memory leak in error path of kcm_sendmsg()") suppressed it by
    updating kcm_tx_msg(head)->last_skb if partial data is copied so that the
    following sendmsg() will resume from the skb.
    
    However, we cannot know how many bytes were copied when we get the error.
    Thus, we could mess up the MSG_MORE queue.
    
    When kcm_sendmsg() fails for SOCK_DGRAM, we should purge the queue as we
    do so for UDP by udp_flush_pending_frames().
    
    Even without this change, when the error occurred, the following sendmsg()
    resumed from a wrong skb and the queue was messed up.  However, we have
    yet to get such a report, and only syzkaller stumbled on it.  So, this
    can be changed safely.
    
    Note this does not change SOCK_SEQPACKET behaviour.
    
    Fixes: c821a88b ("kcm: Fix memory leak in error path of kcm_sendmsg()")
    Fixes: ab7ac4eb ("kcm: Kernel Connection Multiplexor module")
    Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
    Link: https://lore.kernel.org/r/20230912022753.33327-1-kuniyu@amazon.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
    a22730b1
kcmsock.c 42.3 KB