niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

selinux: stop returning node from avc_insert()

Browse source 
The callers haven't used the returned node since
commit 21193dcd1f ("SELinux: more careful use of avd in
avc_has_perm_noaudit") and the return value assignments were removed in
commit 0a9876f36b ("selinux: Remove redundant assignments"). Stop
returning the node altogether and make the functions return void.

Signed-off-by: Stephen Smalley <stephen.smalley.work@gmail.com>
PM: minor subj tweak, repair whitespace damage
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Stephen Smalley 2023-04-03 12:37:53 -04:00 • committed by Paul Moore
parent 3401333188
commit 539813e418
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
security/selinux/avc.c
View file

@ -603,12 +603,10 @@ static int avc_latest_notif_update(int seqno, int is_insert)
* response to a security_compute_av() call. If the * response to a security_compute_av() call. If the
* sequence number @avd->seqno is not less than the latest * sequence number @avd->seqno is not less than the latest
* revocation notification, then the function copies * revocation notification, then the function copies
* the access vectors into a cache entry, returns * the access vectors into a cache entry.
* avc_node inserted. Otherwise, this function returns NULL.
*/ */
static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass, static void avc_insert(u32 ssid, u32 tsid, u16 tclass,
struct av_decision *avd, struct av_decision *avd, struct avc_xperms_node *xp_node)
struct avc_xperms_node *xp_node)
{ {
struct avc_node *pos, *node = NULL; struct avc_node *pos, *node = NULL;
int hvalue; int hvalue;
@ -617,16 +615,16 @@ static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass,
struct hlist_head *head; struct hlist_head *head;
if (avc_latest_notif_update(avd->seqno, 1)) if (avc_latest_notif_update(avd->seqno, 1))
return NULL; return;
node = avc_alloc_node(); node = avc_alloc_node();
if (!node) if (!node)
return NULL; return;
avc_node_populate(node, ssid, tsid, tclass, avd); avc_node_populate(node, ssid, tsid, tclass, avd);
if (avc_xperms_populate(node, xp_node)) { if (avc_xperms_populate(node, xp_node)) {
avc_node_kill(node); avc_node_kill(node);
return NULL; return;
} }
hvalue = avc_hash(ssid, tsid, tclass); hvalue = avc_hash(ssid, tsid, tclass);
@ -644,7 +642,7 @@ static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass,
hlist_add_head_rcu(&node->list, head); hlist_add_head_rcu(&node->list, head);
found: found:
spin_unlock_irqrestore(lock, flag); spin_unlock_irqrestore(lock, flag);
return node; return;
} }
/** /**
@ -984,13 +982,13 @@ int avc_ss_reset(u32 seqno)
* fails. Don't inline this, since it's the slow-path and just results in a * fails. Don't inline this, since it's the slow-path and just results in a
* bigger stack frame. * bigger stack frame.
*/ */
static noinline struct avc_node *avc_compute_av(u32 ssid, u32 tsid, u16 tclass, static noinline void avc_compute_av(u32 ssid, u32 tsid, u16 tclass,
struct av_decision *avd, struct av_decision *avd,
struct avc_xperms_node *xp_node) struct avc_xperms_node *xp_node)
{ {
INIT_LIST_HEAD(&xp_node->xpd_head); INIT_LIST_HEAD(&xp_node->xpd_head);
security_compute_av(ssid, tsid, tclass, avd, &xp_node->xp); security_compute_av(ssid, tsid, tclass, avd, &xp_node->xp);
return avc_insert(ssid, tsid, tclass, avd, xp_node); avc_insert(ssid, tsid, tclass, avd, xp_node);
} }
static noinline int avc_denied(u32 ssid, u32 tsid, static noinline int avc_denied(u32 ssid, u32 tsid,