aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorStanislav Fomichev <sdf@google.com>2019-07-15 12:39:53 -0400
committerDaniel Borkmann <daniel@iogearbox.net>2019-07-15 17:15:53 -0400
commitd4ecfeb15494ec261fef2d25d96eecba66f0b182 (patch)
tree88d1e6879448ca54b57b7ad17dfa3dc0753d0c3f /include/uapi/linux
parentb43995469e5804636a55372e9bbb17ccb22441c5 (diff)
bpf: allow wide aligned loads for bpf_sock_addr user_ip6 and msg_src_ip6
Add explicit check for u64 loads of user_ip6 and msg_src_ip6 and update the comment. Cc: Yonghong Song <yhs@fb.com> Signed-off-by: Stanislav Fomichev <sdf@google.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/bpf.h4
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 {
3248 __u32 user_ip4; /* Allows 1,2,4-byte read and 4-byte write. 3248 __u32 user_ip4; /* Allows 1,2,4-byte read and 4-byte write.
3249 * Stored in network byte order. 3249 * Stored in network byte order.
3250 */ 3250 */
3251 __u32 user_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. 3251 __u32 user_ip6[4]; /* Allows 1,2,4,8-byte read and 4,8-byte write.
3252 * Stored in network byte order. 3252 * Stored in network byte order.
3253 */ 3253 */
3254 __u32 user_port; /* Allows 4-byte read and write. 3254 __u32 user_port; /* Allows 4-byte read and write.
@@ -3260,7 +3260,7 @@ struct bpf_sock_addr {
3260 __u32 msg_src_ip4; /* Allows 1,2,4-byte read and 4-byte write. 3260 __u32 msg_src_ip4; /* Allows 1,2,4-byte read and 4-byte write.
3261 * Stored in network byte order. 3261 * Stored in network byte order.
3262 */ 3262 */
3263 __u32 msg_src_ip6[4]; /* Allows 1,2,4-byte read and 4,8-byte write. 3263 __u32 msg_src_ip6[4]; /* Allows 1,2,4,8-byte read and 4,8-byte write.
3264 * Stored in network byte order. 3264 * Stored in network byte order.
3265 */ 3265 */
3266 __bpf_md_ptr(struct bpf_sock *, sk); 3266 __bpf_md_ptr(struct bpf_sock *, sk);