]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
apparmor: Use IS_ERR_OR_NULL() helper function
authorHongbo Li <lihongbo22@huawei.com>
Wed, 28 Aug 2024 12:26:18 +0000 (20:26 +0800)
committerJohn Johansen <john.johansen@canonical.com>
Wed, 27 Nov 2024 03:21:05 +0000 (19:21 -0800)
Use the IS_ERR_OR_NULL() helper instead of open-coding a
NULL and an error pointer checks to simplify the code and
improve readability.

Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/path.c

index 45ec994b558d7b1d6149ba7f1b68ae16d5942058..d6c74c357ffd595e2cba63818a26ee6048e9a552 100644 (file)
@@ -130,7 +130,7 @@ static int d_namespace_path(const struct path *path, char *buf, char **name,
        /* handle error conditions - and still allow a partial path to
         * be returned.
         */
-       if (!res || IS_ERR(res)) {
+       if (IS_ERR_OR_NULL(res)) {
                if (PTR_ERR(res) == -ENAMETOOLONG) {
                        error = -ENAMETOOLONG;
                        *name = buf;