btf: fix return value check in btf_vmlinux_init()
authorWei Yongjun <weiyongjun1@huawei.com>
Fri, 16 Aug 2019 02:40:44 +0000 (02:40 +0000)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 16 Aug 2019 05:18:17 +0000 (22:18 -0700)
In case of error, the function kobject_create_and_add() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.

Fixes: 341dfcf8d78e ("btf: expose BTF info through sysfs")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/sysfs_btf.c

index 4659349fc7953c5481701e4740f1bf46321b9342..7ae5dddd1fe6a56cd335d659c9a74b6dacef9d1c 100644 (file)
@@ -30,17 +30,12 @@ static struct kobject *btf_kobj;
 
 static int __init btf_vmlinux_init(void)
 {
-       int err;
-
        if (!_binary__btf_vmlinux_bin_start)
                return 0;
 
        btf_kobj = kobject_create_and_add("btf", kernel_kobj);
-       if (IS_ERR(btf_kobj)) {
-               err = PTR_ERR(btf_kobj);
-               btf_kobj = NULL;
-               return err;
-       }
+       if (!btf_kobj)
+               return -ENOMEM;
 
        bin_attr_btf_vmlinux.size = _binary__btf_vmlinux_bin_end -
                                    _binary__btf_vmlinux_bin_start;