bpf: Explicitly memset some bpf info structures declared on the stack (5c6f2588) · Commits · 戴 / test

kernel/bpf/btf.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -4564,7 +4564,7 @@ int btf_get_info_by_fd(const struct btf *btf,
		union bpf_attr __user *uattr)
		{
		struct bpf_btf_info __user *uinfo;
		struct bpf_btf_info info = {};
		struct bpf_btf_info info;
		u32 info_copy, btf_copy;
		void __user *ubtf;
		u32 uinfo_len;
		@@ -4573,6 +4573,7 @@ int btf_get_info_by_fd(const struct btf *btf,
		uinfo_len = attr->info.info_len;

		info_copy = min_t(u32, uinfo_len, sizeof(info));
		memset(&info, 0, sizeof(info));
		if (copy_from_user(&info, uinfo, info_copy))
		return -EFAULT;

+4 −2

Original line number	Diff line number	Diff line
		@@ -2795,7 +2795,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
		union bpf_attr __user *uattr)
		{
		struct bpf_prog_info __user *uinfo = u64_to_user_ptr(attr->info.info);
		struct bpf_prog_info info = {};
		struct bpf_prog_info info;
		u32 info_len = attr->info.info_len;
		struct bpf_prog_stats stats;
		char __user *uinsns;
		@@ -2807,6 +2807,7 @@ static int bpf_prog_get_info_by_fd(struct bpf_prog *prog,
		return err;
		info_len = min_t(u32, sizeof(info), info_len);

		memset(&info, 0, sizeof(info));
		if (copy_from_user(&info, uinfo, info_len))
		return -EFAULT;

		@@ -3070,7 +3071,7 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map,
		union bpf_attr __user *uattr)
		{
		struct bpf_map_info __user *uinfo = u64_to_user_ptr(attr->info.info);
		struct bpf_map_info info = {};
		struct bpf_map_info info;
		u32 info_len = attr->info.info_len;
		int err;

		@@ -3079,6 +3080,7 @@ static int bpf_map_get_info_by_fd(struct bpf_map *map,
		return err;
		info_len = min_t(u32, sizeof(info), info_len);

		memset(&info, 0, sizeof(info));
		info.type = map->map_type;
		info.id = map->id;
		info.key_size = map->key_size;