lkml.org 
[lkml]   [2023]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Subject[PATCH 0/4] Fix UAF caused by racing datagram sending and freeing of nfc_dev
    Date
    (This patchset should be applied in order as changes are dependent.)

    For connectionless transmission, llcp_sock_sendmsg() codepath will
    eventually call nfc_alloc_send_skb() which takes in an nfc_dev as
    an argument for calculating the total size for skb allocation.

    virtual_ncidev_close() codepath eventually releases socket by calling
    nfc_llcp_socket_release() (which sets the sk->sk_state to LLCP_CLOSED)
    and afterwards the nfc_dev will be eventually freed.

    When an ndev gets freed, llcp_sock_sendmsg() will result in an
    use-after-free as it

    (1) doesn't have any checks in place for avoiding the datagram sending.

    (2) calls nfc_llcp_send_ui_frame(), which also has a do-while loop which
    can race with freeing (a msg with size of 4096 is sent in chunks of
    128 in this repro). This loop contains the call to nfc_alloc_send_skb().

    Thus, I extracted nfc_dev access from nfc_alloc_send_skb() to the caller,
    and used a spinlock (rwlock) to protect/serialize access to the nfc_dev to
    avoid the UAF. Tested with syzkaller.

    Since state has to be LLCP_BOUND for datagram sending, we can bail out early
    in llcp_sock_sendmsg().

    The last patch is just a code reformat. As the datagram sending is a bigger
    chunk of the code, we can reduce unnecessary indentation.

    Please review and let me know if any errors are there, and hopefully this
    gets accepted.

    Thanks,
    Siddh

    Siddh Raman Pant (4):
    nfc: Extract nfc_dev access from nfc_alloc_send_skb() into the callers
    nfc: Protect access to nfc_dev in an llcp_sock with a rwlock
    nfc: Do not send datagram if socket state isn't LLCP_BOUND
    nfc: llcp_sock_sendmsg: Reformat code to make the smaller block
    indented

    include/net/nfc/nfc.h | 6 +++---
    net/nfc/core.c | 14 +++++++-------
    net/nfc/llcp.h | 1 +
    net/nfc/llcp_commands.c | 41 +++++++++++++++++++++++++++++++++++------
    net/nfc/llcp_core.c | 31 +++++++++++++++++++------------
    net/nfc/llcp_sock.c | 31 ++++++++++++++++++-------------
    net/nfc/rawsock.c | 8 ++++++--
    7 files changed, 89 insertions(+), 43 deletions(-)

    --
    2.42.0

    \
     
     \ /
      Last update: 2023-11-25 21:27    [W:6.764 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site