summaryrefslogtreecommitdiff
path: root/security/apparmor/path.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2025-01-20 09:58:12 +0100
committerJiri Kosina <jkosina@suse.com>2025-01-20 09:58:12 +0100
commit670af65d2ab4a6a9bb72f014b080757e291ad3fe (patch)
treed54ccf4ba52fa9f15ed8f1de6214edc53e1502be /security/apparmor/path.c
parent53078a736fbc60e5d3a1e14f4cd4214003815026 (diff)
parent1b1d865715e0eda52e62226261651e97673773d6 (diff)
Merge branch 'for-6.14/constify-bin-attribute' into for-linus
- constification of 'struct bin_attribute' in various HID driver (Thomas Weißschuh)
Diffstat (limited to 'security/apparmor/path.c')
-rw-r--r--security/apparmor/path.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/path.c b/security/apparmor/path.c
index 45ec994b558d..d6c74c357ffd 100644
--- a/security/apparmor/path.c
+++ b/security/apparmor/path.c
@@ -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;