github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

apparmor: move the "conflicting profile attachments" infostr to a const declaration

Browse Source 
Instead of having a literal, making this a constant will allow for (hacky)
detection of conflicting profile attachments from inspection of the info
pointer. This is used in the next patch to augment the information provided
through domain.c:x_to_label for ix/ux fallback.

Signed-off-by: Ryan Lee <ryan.lee@canonical.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Ryan Lee 2025-05-01 17:55:44 -07:00 committed by John Johansen
parent 89a3561e69
commit e76d733b1b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/apparmor/domain.c
View File

@ -28,6 +28,8 @@
#include "include/policy.h"
#include "include/policy_ns.h"
static const char * const CONFLICTING_ATTACH_STR = "conflicting profile attachments";
/**
* may_change_ptraced_domain - check if can change profile on ptraced task
* @to_cred: cred of task changing domain
@ -485,7 +487,7 @@ static struct aa_label *find_attach(const struct linux_binprm *bprm,
if (!candidate || conflict) {
if (conflict)
*info = "conflicting profile attachments";
*info = CONFLICTING_ATTACH_STR;
rcu_read_unlock();
return NULL;
}