Skip to contentSkip to conversation

libsepol: check for overflow in put_entry()

PATCH In review Christian Göttsche 2 participants 3 messages Jul 6, 2023 – Jul 12, 2023 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libsepol: check for overflow in put_entry()

put_entry() is used during writing binary policies. Avoid short writes due to an overflow.

---
 libsepol/src/services.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
libsepol/src/services.c +4 -1
index 062510ab..07ae051b 100644
@@ -1708,7 +1708,10 @@ int next_entry(void *buf, struct policy_file *fp, size_t bytes)
 size_t put_entry(const void *ptr, size_t size, size_t n,
 			struct policy_file *fp)
 {
-	size_t bytes = size * n;
+	size_t bytes;
+
+	if (__builtin_mul_overflow(size, n, &bytes))
+		return 0;
 
 	switch (fp->type) {
 	case PF_USE_STDIO:
Signature · 1 line
2.40.1
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Christian Göttsche

put_entry() is used during writing binary policies. Avoid short writes due to an overflow.

Quoted 23 lines
---
 libsepol/src/services.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
libsepol/src/services.c +4 -2
index 062510ab..07ae051b 100644
@@ -1708,7 +1708,10 @@ int next_entry(void *buf, struct policy_file *fp, size_t bytes)
 size_t put_entry(const void *ptr, size_t size, size_t n,
                        struct policy_file *fp)
 {
-       size_t bytes = size * n;
+       size_t bytes;
+
+       if (__builtin_mul_overflow(size, n, &bytes))
+               return 0;
 
        switch (fp->type) {
        case PF_USE_STDIO:
--

2.40.1

#2 lore raw
Quoted 11 lines · James Carter
Quoted 5 lines · Christian Göttsche

put_entry() is used during writing binary policies. Avoid short writes due to an overflow.

Merged.
Thanks,
Jim

Quoted 23 lines
Quoted 23 lines
---
 libsepol/src/services.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
libsepol/src/services.c +4 -2
index 062510ab..07ae051b 100644
@@ -1708,7 +1708,10 @@ int next_entry(void *buf, struct policy_file *fp, size_t bytes)
 size_t put_entry(const void *ptr, size_t size, size_t n,
                        struct policy_file *fp)
 {
-       size_t bytes = size * n;
+       size_t bytes;
+
+       if (__builtin_mul_overflow(size, n, &bytes))
+               return 0;
 
        switch (fp->type) {
        case PF_USE_STDIO:
--

2.40.1