]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
fs: kernfs: Fix possible null-pointer dereferences in kernfs_path_from_node_locked()
authorJia-Ju Bai <baijiaju1990@gmail.com>
Wed, 24 Jul 2019 02:22:42 +0000 (10:22 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jul 2019 13:32:51 +0000 (15:32 +0200)
In kernfs_path_from_node_locked(), there is an if statement on line 147
to check whether buf is NULL:
    if (buf)

When buf is NULL, it is used on line 151:
    len += strlcpy(buf + len, parent_str, ...)
and line 158:
    len += strlcpy(buf + len, "/", ...)
and line 160:
    len += strlcpy(buf + len, kn->name, ...)

Thus, possible null-pointer dereferences may occur.

To fix these possible bugs, buf is checked before being used.
If it is NULL, -EINVAL is returned.

These bugs are found by a static analysis tool STCheck written by us.

Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Link: https://lore.kernel.org/r/20190724022242.27505-1-baijiaju1990@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/kernfs/dir.c

index ddf537923a0aff320e48bc6e48c350833807dd91..6ebae6bbe6a5e6f127aab0318f3d06045bed837e 100644 (file)
@@ -137,6 +137,9 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to,
        if (kn_from == kn_to)
                return strlcpy(buf, "/", buflen);
 
+       if (!buf)
+               return -EINVAL;
+
        common = kernfs_common_ancestor(kn_from, kn_to);
        if (WARN_ON(!common))
                return -EINVAL;
@@ -144,8 +147,7 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to,
        depth_to = kernfs_depth(common, kn_to);
        depth_from = kernfs_depth(common, kn_from);
 
-       if (buf)
-               buf[0] = '\0';
+       buf[0] = '\0';
 
        for (i = 0; i < depth_from; i++)
                len += strlcpy(buf + len, parent_str,