diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-29 21:25:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-29 21:25:29 -0700 |
| commit | f0b5989745c3e0e92424d36869a97e4e8df7ab13 (patch) | |
| tree | 0e9759b9d6060bb94cad676b1b16e423d5ad2523 /kernel/bpf/btf.c | |
| parent | 1a147b74c2fd4058dea0133cb2471724c3b3de09 (diff) | |
| parent | 7111951b8d4973bda27ff663f2cf18b663d15b48 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment conflict in mac80211.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/btf.c')
| -rw-r--r-- | kernel/bpf/btf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 4b64b40c1aa8..50f3c8c7bb2c 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4577,7 +4577,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; @@ -4586,6 +4586,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; |