stuartl/linux-mainline
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux synced 2025-10-02 14:18:33 +10:00
Code Issues Releases Wiki Activity

selinux: use GFP_KERNEL while reading binary policy

Browse Source 
Use GFP_KERNEL instead of GFP_ATOMIC while reading a binary policy in
sens_read() and cat_read(), similar to surrounding code.

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Christian Göttsche 2023-08-07 20:05:18 +02:00 committed by Paul Moore
parent 64f18f8a8c
commit 2b86e04bce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/selinux/ss/policydb.c
View File

@ -1597,7 +1597,7 @@ static int sens_read(struct policydb *p, struct symtab *s, void *fp)
__le32 buf[2]; __le32 buf[2];
u32 len; u32 len;
levdatum = kzalloc(sizeof(*levdatum), GFP_ATOMIC); levdatum = kzalloc(sizeof(*levdatum), GFP_KERNEL);
if (!levdatum) if (!levdatum)
return -ENOMEM; return -ENOMEM;
@ -1608,12 +1608,12 @@ static int sens_read(struct policydb *p, struct symtab *s, void *fp)
len = le32_to_cpu(buf[0]); len = le32_to_cpu(buf[0]);
levdatum->isalias = le32_to_cpu(buf[1]); levdatum->isalias = le32_to_cpu(buf[1]);
rc = str_read(&key, GFP_ATOMIC, fp, len); rc = str_read(&key, GFP_KERNEL, fp, len);
if (rc) if (rc)
goto bad; goto bad;
rc = -ENOMEM; rc = -ENOMEM;
levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_ATOMIC); levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_KERNEL);
if (!levdatum->level) if (!levdatum->level)
goto bad; goto bad;
@ -1638,7 +1638,7 @@ static int cat_read(struct policydb *p, struct symtab *s, void *fp)
__le32 buf[3]; __le32 buf[3];
u32 len; u32 len;
catdatum = kzalloc(sizeof(*catdatum), GFP_ATOMIC); catdatum = kzalloc(sizeof(*catdatum), GFP_KERNEL);
if (!catdatum) if (!catdatum)
return -ENOMEM; return -ENOMEM;
@ -1650,7 +1650,7 @@ static int cat_read(struct policydb *p, struct symtab *s, void *fp)
catdatum->value = le32_to_cpu(buf[1]); catdatum->value = le32_to_cpu(buf[1]);
catdatum->isalias = le32_to_cpu(buf[2]); catdatum->isalias = le32_to_cpu(buf[2]);
rc = str_read(&key, GFP_ATOMIC, fp, len); rc = str_read(&key, GFP_KERNEL, fp, len);
if (rc) if (rc)
goto bad; goto bad;