diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-12-02 11:22:11 -0500 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-12-02 11:22:11 -0500 |
| commit | 8f109f287fdc7b8fc7dcb6b2190c8b17dc22fcda (patch) | |
| tree | 8c59d34866fcb6d121bbb30014ca46a49a818f1b /security/apparmor/path.c | |
| parent | 54254727837440966c3381ea688df002ff14f269 (diff) | |
| parent | 40384c840ea1944d7c5a392e8975ed088ecf0b37 (diff) | |
| download | linux-next-8f109f287fdc7b8fc7dcb6b2190c8b17dc22fcda.tar.gz linux-next-8f109f287fdc7b8fc7dcb6b2190c8b17dc22fcda.zip | |
Merge drm/drm-next into drm-xe-next
A backmerge to get the PMT preparation work for
merging the BMG PMT support.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'security/apparmor/path.c')
| -rw-r--r-- | security/apparmor/path.c | 2 |
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; |