|
 |
71cd55 |
From 07d6f1cea5a8ec0251606636189bc519d80b0729 Mon Sep 17 00:00:00 2001
|
|
|
71cd55 |
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
|
71cd55 |
Date: Thu, 1 Jul 2021 20:07:07 +0200
|
|
|
71cd55 |
Subject: [PATCH] libsepol: assure string NUL-termination of ibdev_name
|
|
|
71cd55 |
MIME-Version: 1.0
|
|
|
71cd55 |
Content-Type: text/plain; charset=UTF-8
|
|
|
71cd55 |
Content-Transfer-Encoding: 8bit
|
|
|
71cd55 |
|
|
|
71cd55 |
Clang complains:
|
|
|
71cd55 |
|
|
|
71cd55 |
ibendport_record.c: In function ‘sepol_ibendport_get_ibdev_name’:
|
|
|
71cd55 |
ibendport_record.c:169:2: error: ‘strncpy’ specified bound 64 equals destination size [-Werror=stringop-truncation]
|
|
|
71cd55 |
169 | strncpy(tmp_ibdev_name, ibendport->ibdev_name, IB_DEVICE_NAME_MAX);
|
|
|
71cd55 |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
71cd55 |
ibendport_record.c: In function ‘sepol_ibendport_set_ibdev_name’:
|
|
|
71cd55 |
ibendport_record.c:189:2: error: ‘strncpy’ specified bound 64 equals destination size [-Werror=stringop-truncation]
|
|
|
71cd55 |
189 | strncpy(tmp, ibdev_name, IB_DEVICE_NAME_MAX);
|
|
|
71cd55 |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
71cd55 |
|
|
|
71cd55 |
strncpy(3) does not NUL-terminate the destination if the source is of
|
|
|
71cd55 |
the same length or longer then the specified size.
|
|
|
71cd55 |
The source of these copies are retrieved from
|
|
|
71cd55 |
sepol_ibendport_alloc_ibdev_name(), which allocates a fixed amount of
|
|
|
71cd55 |
IB_DEVICE_NAME_MAX bytes.
|
|
|
71cd55 |
Reduce the size to copy by 1 of all memory regions allocated by
|
|
|
71cd55 |
sepol_ibendport_alloc_ibdev_name().
|
|
|
71cd55 |
|
|
|
71cd55 |
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
|
71cd55 |
---
|
|
|
71cd55 |
libsepol/src/ibendport_record.c | 8 ++++----
|
|
|
71cd55 |
libsepol/src/ibendports.c | 2 +-
|
|
|
71cd55 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
71cd55 |
|
|
|
71cd55 |
diff --git a/libsepol/src/ibendport_record.c b/libsepol/src/ibendport_record.c
|
|
|
71cd55 |
index adf671615e5c..1eb50914b8c0 100644
|
|
|
71cd55 |
--- a/libsepol/src/ibendport_record.c
|
|
|
71cd55 |
+++ b/libsepol/src/ibendport_record.c
|
|
|
71cd55 |
@@ -62,7 +62,7 @@ int sepol_ibendport_key_create(sepol_handle_t *handle,
|
|
|
71cd55 |
if (sepol_ibendport_alloc_ibdev_name(handle, &tmp_key->ibdev_name) < 0)
|
|
|
71cd55 |
goto err;
|
|
|
71cd55 |
|
|
|
71cd55 |
- strncpy(tmp_key->ibdev_name, ibdev_name, IB_DEVICE_NAME_MAX);
|
|
|
71cd55 |
+ strncpy(tmp_key->ibdev_name, ibdev_name, IB_DEVICE_NAME_MAX - 1);
|
|
|
71cd55 |
tmp_key->port = port;
|
|
|
71cd55 |
|
|
|
71cd55 |
*key_ptr = tmp_key;
|
|
|
71cd55 |
@@ -166,7 +166,7 @@ int sepol_ibendport_get_ibdev_name(sepol_handle_t *handle,
|
|
|
71cd55 |
if (sepol_ibendport_alloc_ibdev_name(handle, &tmp_ibdev_name) < 0)
|
|
|
71cd55 |
goto err;
|
|
|
71cd55 |
|
|
|
71cd55 |
- strncpy(tmp_ibdev_name, ibendport->ibdev_name, IB_DEVICE_NAME_MAX);
|
|
|
71cd55 |
+ strncpy(tmp_ibdev_name, ibendport->ibdev_name, IB_DEVICE_NAME_MAX - 1);
|
|
|
71cd55 |
*ibdev_name = tmp_ibdev_name;
|
|
|
71cd55 |
return STATUS_SUCCESS;
|
|
|
71cd55 |
|
|
|
71cd55 |
@@ -186,7 +186,7 @@ int sepol_ibendport_set_ibdev_name(sepol_handle_t *handle,
|
|
|
71cd55 |
if (sepol_ibendport_alloc_ibdev_name(handle, &tmp) < 0)
|
|
|
71cd55 |
goto err;
|
|
|
71cd55 |
|
|
|
71cd55 |
- strncpy(tmp, ibdev_name, IB_DEVICE_NAME_MAX);
|
|
|
71cd55 |
+ strncpy(tmp, ibdev_name, IB_DEVICE_NAME_MAX - 1);
|
|
|
71cd55 |
free(ibendport->ibdev_name);
|
|
|
71cd55 |
ibendport->ibdev_name = tmp;
|
|
|
71cd55 |
return STATUS_SUCCESS;
|
|
|
71cd55 |
@@ -230,7 +230,7 @@ int sepol_ibendport_clone(sepol_handle_t *handle,
|
|
|
71cd55 |
if (sepol_ibendport_alloc_ibdev_name(handle, &new_ibendport->ibdev_name) < 0)
|
|
|
71cd55 |
goto omem;
|
|
|
71cd55 |
|
|
|
71cd55 |
- strncpy(new_ibendport->ibdev_name, ibendport->ibdev_name, IB_DEVICE_NAME_MAX);
|
|
|
71cd55 |
+ strncpy(new_ibendport->ibdev_name, ibendport->ibdev_name, IB_DEVICE_NAME_MAX - 1);
|
|
|
71cd55 |
new_ibendport->port = ibendport->port;
|
|
|
71cd55 |
|
|
|
71cd55 |
if (ibendport->con &&
|
|
|
71cd55 |
diff --git a/libsepol/src/ibendports.c b/libsepol/src/ibendports.c
|
|
|
71cd55 |
index 6d56c9a1793f..ee5cb1930f31 100644
|
|
|
71cd55 |
--- a/libsepol/src/ibendports.c
|
|
|
71cd55 |
+++ b/libsepol/src/ibendports.c
|
|
|
71cd55 |
@@ -34,7 +34,7 @@ static int ibendport_from_record(sepol_handle_t *handle,
|
|
|
71cd55 |
&ibdev_name) < 0)
|
|
|
71cd55 |
goto err;
|
|
|
71cd55 |
|
|
|
71cd55 |
- strncpy(tmp_ibendport->u.ibendport.dev_name, ibdev_name, IB_DEVICE_NAME_MAX);
|
|
|
71cd55 |
+ strncpy(tmp_ibendport->u.ibendport.dev_name, ibdev_name, IB_DEVICE_NAME_MAX - 1);
|
|
|
71cd55 |
|
|
|
71cd55 |
free(ibdev_name);
|
|
|
71cd55 |
ibdev_name = NULL;
|
|
|
71cd55 |
--
|
|
|
71cd55 |
2.32.0
|
|
|
71cd55 |
|