• John Fastabend's avatar
    bpf, sockmap: Attach map progs to psock early for feature probes · 38207a5e
    John Fastabend authored
    When a TCP socket is added to a sock map we look at the programs attached
    to the map to determine what proto op hooks need to be changed. Before
    the patch in the 'fixes' tag there were only two categories -- the empty
    set of programs or a TX policy. In any case the base set handled the
    receive case.
    
    After the fix we have an optimized program for receive that closes a small,
    but possible, race on receive. This program is loaded only when the map the
    psock is being added to includes a RX policy. Otherwise, the race is not
    possible so we don't need to handle the race condition.
    
    In order for the call to sk_psock_init() to correctly evaluate the above
    conditions all progs need to be set in the psock before the call. However,
    in the current code this is not the case. We end up evaluating the
    requirements on the old prog state. If your psock is attached to multiple
    maps -- for example a tx map and rx map -- then the second update would pull
    in the correct maps. But, the other pattern with a single rx enabled map
    the correct receive hooks are not used. The result is the race fixed by the
    patch in the fixes tag below may still be seen in this case.
    
    To fix we simply set all psock->progs before doing the call into
    sock_map_init(). With this the init() call gets the full list of programs
    and chooses the correct proto ops on the first iteration instead of
    requiring the second update to pull them in. This fixes the race case when
    only a single map is used.
    
    Fixes: c5d2177a ("bpf, sockmap: Fix race in ingress receive verdict with redirect to self")
    Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
    Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
    Link: https://lore.kernel.org/bpf/20211119181418.353932-2-john.fastabend@gmail.com
    38207a5e
sock_map.c 37.3 KB