|
 |
71cd55 |
From 19a6ebfa895ce3baa6bd07cb5227556c82f20cb6 Mon Sep 17 00:00:00 2001
|
|
|
71cd55 |
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
|
71cd55 |
Date: Tue, 8 Jun 2021 17:59:01 +0200
|
|
|
71cd55 |
Subject: [PATCH] libsepol: do not allocate memory of size 0
|
|
|
71cd55 |
MIME-Version: 1.0
|
|
|
71cd55 |
Content-Type: text/plain; charset=UTF-8
|
|
|
71cd55 |
Content-Transfer-Encoding: 8bit
|
|
|
71cd55 |
|
|
|
71cd55 |
In case cats_ebitmap_len() returns 0, do not allocate but quit.
|
|
|
71cd55 |
|
|
|
71cd55 |
Found by clang-analyzer
|
|
|
71cd55 |
|
|
|
71cd55 |
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
|
71cd55 |
Acked-by: James Carter <jwcart2@gmail.com>
|
|
|
71cd55 |
---
|
|
|
71cd55 |
libsepol/src/kernel_to_cil.c | 5 ++++-
|
|
|
71cd55 |
libsepol/src/kernel_to_conf.c | 5 ++++-
|
|
|
71cd55 |
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
71cd55 |
|
|
|
71cd55 |
diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
|
|
|
71cd55 |
index 30a27bf527d5..5aaee6288565 100644
|
|
|
71cd55 |
--- a/libsepol/src/kernel_to_cil.c
|
|
|
71cd55 |
+++ b/libsepol/src/kernel_to_cil.c
|
|
|
71cd55 |
@@ -1034,11 +1034,14 @@ static char *cats_ebitmap_to_str(struct ebitmap *cats, char **val_to_name)
|
|
|
71cd55 |
{
|
|
|
71cd55 |
struct ebitmap_node *node;
|
|
|
71cd55 |
uint32_t i, start, range;
|
|
|
71cd55 |
- char *catsbuf, *p;
|
|
|
71cd55 |
+ char *catsbuf = NULL, *p;
|
|
|
71cd55 |
const char *fmt;
|
|
|
71cd55 |
int len, remaining;
|
|
|
71cd55 |
|
|
|
71cd55 |
remaining = (int)cats_ebitmap_len(cats, val_to_name);
|
|
|
71cd55 |
+ if (remaining == 0) {
|
|
|
71cd55 |
+ goto exit;
|
|
|
71cd55 |
+ }
|
|
|
71cd55 |
catsbuf = malloc(remaining);
|
|
|
71cd55 |
if (!catsbuf) {
|
|
|
71cd55 |
goto exit;
|
|
|
71cd55 |
diff --git a/libsepol/src/kernel_to_conf.c b/libsepol/src/kernel_to_conf.c
|
|
|
71cd55 |
index ffdf179a71f3..cb8e13809d52 100644
|
|
|
71cd55 |
--- a/libsepol/src/kernel_to_conf.c
|
|
|
71cd55 |
+++ b/libsepol/src/kernel_to_conf.c
|
|
|
71cd55 |
@@ -1025,12 +1025,15 @@ static char *cats_ebitmap_to_str(struct ebitmap *cats, char **val_to_name)
|
|
|
71cd55 |
{
|
|
|
71cd55 |
struct ebitmap_node *node;
|
|
|
71cd55 |
uint32_t i, start, range, first;
|
|
|
71cd55 |
- char *catsbuf, *p;
|
|
|
71cd55 |
+ char *catsbuf = NULL, *p;
|
|
|
71cd55 |
const char *fmt;
|
|
|
71cd55 |
char sep;
|
|
|
71cd55 |
int len, remaining;
|
|
|
71cd55 |
|
|
|
71cd55 |
remaining = (int)cats_ebitmap_len(cats, val_to_name);
|
|
|
71cd55 |
+ if (remaining == 0) {
|
|
|
71cd55 |
+ goto exit;
|
|
|
71cd55 |
+ }
|
|
|
71cd55 |
catsbuf = malloc(remaining);
|
|
|
71cd55 |
if (!catsbuf) {
|
|
|
71cd55 |
goto exit;
|
|
|
71cd55 |
--
|
|
|
71cd55 |
2.32.0
|
|
|
71cd55 |
|