Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says:

====================
pull-request: bpf 2019-07-18

The following pull-request contains BPF updates for your *net* tree.

The main changes are:

1) verifier precision propagation fix, from Andrii.

2) BTF size fix for typedefs, from Andrii.

3) a bunch of big endian fixes, from Ilya.

4) wide load from bpf_sock_addr fixes, from Stanislav.

5) a bunch of misc fixes from a number of developers.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 6f68438aa4ed..81be929b89fc 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -3248,7 +3248,7 @@ struct bpf_sock_addr {
         __u32 user_ip4;         /* Allows 1,2,4-byte read and 4-byte write.
                                  * Stored in network byte order.
                                  */
-        __u32 user_ip6[4];      /* Allows 1,2,4-byte read and 4,8-byte write.
+        __u32 user_ip6[4];      /* Allows 1,2,4,8-byte read and 4,8-byte write.
                                  * Stored in network byte order.
                                  */
         __u32 user_port;        /* Allows 4-byte read and write.
@@ -3260,7 +3260,7 @@ struct bpf_sock_addr {
         __u32 msg_src_ip4;      /* Allows 1,2,4-byte read and 4-byte write.
                                  * Stored in network byte order.
                                  */
-        __u32 msg_src_ip6[4];   /* Allows 1,2,4-byte read and 4,8-byte write.
+        __u32 msg_src_ip6[4];   /* Allows 1,2,4,8-byte read and 4,8-byte write.
                                  * Stored in network byte order.
                                  */
         __bpf_md_ptr(struct bpf_sock *, sk);