bpf: sockmap: Enable map_update_elem from bpf_iter

Allow passing a pointer to a BTF struct sock_common* when updating a sockmap or sockhash. Since BTF pointers can fault and therefore be NULL at runtime we need to add an additional !sk check to sock_map_update_elem. Since we may be passed a request or timewait socket we also need to check sk_fullsock. Doing this allows calling map_update_elem on sockmap from bpf_iter context, which uses BTF pointers.

Lorenz Bauer committed 6 years ago

Commit 6550f2d1 parent efa90b52 files · +4 −1Browse files

Showing the changes to kernel (1 of 2 files). Show all

Unified · Split

kernel/bpf/verifier.c+1−1

@@ -3943,7 +3943,7 @@ static int resolve_map_arg_type(struct bpf_verifier_env *env, · 3942 unmodified lines
3943	3943	case BPF_MAP_TYPE_SOCKMAP:
3944	3944	case BPF_MAP_TYPE_SOCKHASH:
3945	3945	if (*arg_type == ARG_PTR_TO_MAP_VALUE) {
3946		− *arg_type = ARG_PTR_TO_SOCKET;
	3946	+ *arg_type = ARG_PTR_TO_BTF_ID_SOCK_COMMON;
3947	3947	} else {
3948	3948	verbose(env, "invalid arg_type for sockmap/sockhash\n");
3949	3949	return -EINVAL;

bpf: sockmap: Enable map_update_elem from bpf_iter

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code