bpf: Sockmap/tls, fix pop data with SK_DROP return code

When user returns SK_DROP we need to reset the number of copied bytes
to indicate to the user the bytes were dropped and not sent. If we
don't reset the copied arg sendmsg will return as if those bytes were
copied giving the user a positive return value.

This works as expected today except in the case where the user also
pops bytes. In the pop case the sg.size is reduced but we don't correctly
account for this when copied bytes is reset. The popped bytes are not
accounted for and we return a small positive value potentially confusing
the user.

The reason this happens is due to a typo where we do the wrong comparison
when accounting for pop bytes. In this fix notice the if/else is not
needed and that we have a similar problem if we push data except its not
visible to the user because if delta is larger the sg.size we return a
negative value so it appears as an error regardless.

Fixes: 490c0a9dc8781 ("bpf: helper to pop data from messages")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/bpf/20200111061206.8028-9-john.fastabend@gmail.com

diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c
index e6b08b5a089559ae400336c3e4fee0dc1752a91e..8a01428f80c1c4b23e2ae0568efb2aa0e0f71ccb 100644 (file)
--- a/net/ipv4/tcp_bpf.c
+++ b/net/ipv4/tcp_bpf.c
@@ -315,10 +315,7 @@ more_data:
                 */
                delta = msg->sg.size;
                psock->eval = sk_psock_msg_verdict(sk, psock, msg);
-               if (msg->sg.size < delta)
-                       delta -= msg->sg.size;
-               else
-                       delta = 0;
+               delta -= msg->sg.size;
        }
 
        if (msg->cork_bytes &&

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 21c7725d17ca8d285b3fc1b91e79c216a365670a..159d49dab403861e78d7d174eac10c8fd57028a3 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -809,10 +809,7 @@ more_data:
        if (psock->eval == __SK_NONE) {
                delta = msg->sg.size;
                psock->eval = sk_psock_msg_verdict(sk, psock, msg);
-               if (delta < msg->sg.size)
-                       delta -= msg->sg.size;
-               else
-                       delta = 0;
+               delta -= msg->sg.size;
        }
        if (msg->cork_bytes && msg->cork_bytes > msg->sg.size &&
            !enospc && !full_record) {