Skip to contentSkip to conversation

selinux: use GFP_KERNEL while reading binary policy

RFC PATCH Applied Christian Göttsche 3 participants 4 messages Aug 7, 2023 – Aug 8, 2023 SELinux security module

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 selinux: use GFP_KERNEL while reading binary policy

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

---
 security/selinux/ss/policydb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
security/selinux/ss/policydb.c +5 -5
index a424997c79eb..bb850b608dc6 100644
@@ -1597,7 +1597,7 @@ static int sens_read(struct policydb *p, struct symtab *s, void *fp)
 	__le32 buf[2];
 	u32 len;
 
-	levdatum = kzalloc(sizeof(*levdatum), GFP_ATOMIC);
+	levdatum = kzalloc(sizeof(*levdatum), GFP_KERNEL);
 	if (!levdatum)
 		return -ENOMEM;
 
@@ -1608,12 +1608,12 @@ static int sens_read(struct policydb *p, struct symtab *s, void *fp)
 	len = le32_to_cpu(buf[0]);
 	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)
 		goto bad;
 
 	rc = -ENOMEM;
-	levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_ATOMIC);
+	levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_KERNEL);
 	if (!levdatum->level)
 		goto bad;
 
@@ -1638,7 +1638,7 @@ static int cat_read(struct policydb *p, struct symtab *s, void *fp)
 	__le32 buf[3];
 	u32 len;
 
-	catdatum = kzalloc(sizeof(*catdatum), GFP_ATOMIC);
+	catdatum = kzalloc(sizeof(*catdatum), GFP_KERNEL);
 	if (!catdatum)
 		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->isalias = le32_to_cpu(buf[2]);
 
-	rc = str_read(&key, GFP_ATOMIC, fp, len);
+	rc = str_read(&key, GFP_KERNEL, fp, len);
 	if (rc)
 		goto bad;
 
Signature · 1 line
2.40.1
maintainer Applied
#1 lore raw
Quoted 8 lines · On Aug 7, 2023 =?UTF-8?q?Christian=20G=C3=B6ttsche?= <[email protected]>…

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

---
 security/selinux/ss/policydb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Merged into selinux/next, thanks.

--
paul-moore.com

maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Christian Göttsche
Quoted 5 lines · Christian Göttsche

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

Congrats, you found something that appears to have been present since before SELinux went into mainline Linux 2.6.0-test3. Going back to my old CVS history, it looks like we switched the other allocations from GFP_ATOMIC to GFP_KERNEL at a time when all of the MLS-related functions were still in mls.c rather than policydb.c, but those didn't get updated and were subsequently moved over.

Quoted 53 lines
---
 security/selinux/ss/policydb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
security/selinux/ss/policydb.c +5 -6
index a424997c79eb..bb850b608dc6 100644
@@ -1597,7 +1597,7 @@ static int sens_read(struct policydb *p, struct symtab *s, void *fp)
        __le32 buf[2];
        u32 len;
 
-       levdatum = kzalloc(sizeof(*levdatum), GFP_ATOMIC);
+       levdatum = kzalloc(sizeof(*levdatum), GFP_KERNEL);
        if (!levdatum)
                return -ENOMEM;
 
@@ -1608,12 +1608,12 @@ static int sens_read(struct policydb *p, struct symtab *s, void *fp)
        len = le32_to_cpu(buf[0]);
        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)
                goto bad;
 
        rc = -ENOMEM;
-       levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_ATOMIC);
+       levdatum->level = kmalloc(sizeof(*levdatum->level), GFP_KERNEL);
        if (!levdatum->level)
                goto bad;
 
@@ -1638,7 +1638,7 @@ static int cat_read(struct policydb *p, struct symtab *s, void *fp)
        __le32 buf[3];
        u32 len;
 
-       catdatum = kzalloc(sizeof(*catdatum), GFP_ATOMIC);
+       catdatum = kzalloc(sizeof(*catdatum), GFP_KERNEL);
        if (!catdatum)
                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->isalias = le32_to_cpu(buf[2]);
 
-       rc = str_read(&key, GFP_ATOMIC, fp, len);
+       rc = str_read(&key, GFP_KERNEL, fp, len);
        if (rc)
                goto bad;
 
--

2.40.1

maintainer
#3 lore raw
Quoted 10 lines · Stephen Smalley
Quoted 5 lines · Christian Göttsche

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

Congrats, you found something that appears to have been present since before SELinux went into mainline Linux 2.6.0-test3 ...

Fun fact, Linux v2.6.0-test3 was released 20 years ago today :)

Signature · 1 line
paul-moore.com