Skip to contentSkip to conversation

libselinux: use reentrant strtok_r(3)

PATCH In review Christian Göttsche 2 participants 3 messages Jan 15, 2024 – Jan 25, 2024 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselinux: use reentrant strtok_r(3)

Use the reentrant version strtok_r(3) instead of strtok(3) to avoid potential data races with concurrent threads.

---
 libselinux/src/selinux_restorecon.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
libselinux/src/selinux_restorecon.c +7 -5
index 38f10f1c..acb729c8 100644
@@ -243,7 +243,7 @@ static uint64_t exclude_non_seclabel_mounts(void)
 	int index = 0, found = 0;
 	uint64_t nfile = 0;
 	char *mount_info[4];
-	char *buf = NULL, *item;
+	char *buf = NULL, *item, *saveptr;
 
 	/* Check to see if the kernel supports seclabel */
 	if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
@@ -258,13 +258,14 @@ static uint64_t exclude_non_seclabel_mounts(void)
 	while (getline(&buf, &len, fp) != -1) {
 		found = 0;
 		index = 0;
-		item = strtok(buf, " ");
+		saveptr = NULL;
+		item = strtok_r(buf, " ", &saveptr);
 		while (item != NULL) {
 			mount_info[index] = item;
 			index++;
 			if (index == 4)
 				break;
-			item = strtok(NULL, " ");
+			item = strtok_r(NULL, " ", &saveptr);
 		}
 		if (index < 4) {
 			selinux_log(SELINUX_ERROR,
@@ -276,14 +277,15 @@ static uint64_t exclude_non_seclabel_mounts(void)
 		/* Remove pre-existing entry */
 		remove_exclude(mount_info[1]);
 
-		item = strtok(mount_info[3], ",");
+		saveptr = NULL;
+		item = strtok_r(mount_info[3], ",", &saveptr);
 		while (item != NULL) {
 			if (strcmp(item, "seclabel") == 0) {
 				found = 1;
 				nfile += file_system_count(mount_info[1]);
 				break;
 			}
-			item = strtok(NULL, ",");
+			item = strtok_r(NULL, ",", &saveptr);
 		}
 
 		/* Exclude mount points without the seclabel option */
Signature · 1 line
2.43.0
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Christian Göttsche

Use the reentrant version strtok_r(3) instead of strtok(3) to avoid potential data races with concurrent threads.

Quoted 56 lines
---
 libselinux/src/selinux_restorecon.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
libselinux/src/selinux_restorecon.c +7 -6
index 38f10f1c..acb729c8 100644
@@ -243,7 +243,7 @@ static uint64_t exclude_non_seclabel_mounts(void)
        int index = 0, found = 0;
        uint64_t nfile = 0;
        char *mount_info[4];
-       char *buf = NULL, *item;
+       char *buf = NULL, *item, *saveptr;
 
        /* Check to see if the kernel supports seclabel */
        if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
@@ -258,13 +258,14 @@ static uint64_t exclude_non_seclabel_mounts(void)
        while (getline(&buf, &len, fp) != -1) {
                found = 0;
                index = 0;
-               item = strtok(buf, " ");
+               saveptr = NULL;
+               item = strtok_r(buf, " ", &saveptr);
                while (item != NULL) {
                        mount_info[index] = item;
                        index++;
                        if (index == 4)
                                break;
-                       item = strtok(NULL, " ");
+                       item = strtok_r(NULL, " ", &saveptr);
                }
                if (index < 4) {
                        selinux_log(SELINUX_ERROR,
@@ -276,14 +277,15 @@ static uint64_t exclude_non_seclabel_mounts(void)
                /* Remove pre-existing entry */
                remove_exclude(mount_info[1]);
 
-               item = strtok(mount_info[3], ",");
+               saveptr = NULL;
+               item = strtok_r(mount_info[3], ",", &saveptr);
                while (item != NULL) {
                        if (strcmp(item, "seclabel") == 0) {
                                found = 1;
                                nfile += file_system_count(mount_info[1]);
                                break;
                        }
-                       item = strtok(NULL, ",");
+                       item = strtok_r(NULL, ",", &saveptr);
                }
 
                /* Exclude mount points without the seclabel option */
--

2.43.0

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

Use the reentrant version strtok_r(3) instead of strtok(3) to avoid potential data races with concurrent threads.

Merged.
Thanks,
Jim

Quoted 56 lines
Quoted 56 lines
---
 libselinux/src/selinux_restorecon.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
libselinux/src/selinux_restorecon.c +7 -6
index 38f10f1c..acb729c8 100644
@@ -243,7 +243,7 @@ static uint64_t exclude_non_seclabel_mounts(void)
        int index = 0, found = 0;
        uint64_t nfile = 0;
        char *mount_info[4];
-       char *buf = NULL, *item;
+       char *buf = NULL, *item, *saveptr;
 
        /* Check to see if the kernel supports seclabel */
        if (uname(&uts) == 0 && strverscmp(uts.release, "2.6.30") < 0)
@@ -258,13 +258,14 @@ static uint64_t exclude_non_seclabel_mounts(void)
        while (getline(&buf, &len, fp) != -1) {
                found = 0;
                index = 0;
-               item = strtok(buf, " ");
+               saveptr = NULL;
+               item = strtok_r(buf, " ", &saveptr);
                while (item != NULL) {
                        mount_info[index] = item;
                        index++;
                        if (index == 4)
                                break;
-                       item = strtok(NULL, " ");
+                       item = strtok_r(NULL, " ", &saveptr);
                }
                if (index < 4) {
                        selinux_log(SELINUX_ERROR,
@@ -276,14 +277,15 @@ static uint64_t exclude_non_seclabel_mounts(void)
                /* Remove pre-existing entry */
                remove_exclude(mount_info[1]);
 
-               item = strtok(mount_info[3], ",");
+               saveptr = NULL;
+               item = strtok_r(mount_info[3], ",", &saveptr);
                while (item != NULL) {
                        if (strcmp(item, "seclabel") == 0) {
                                found = 1;
                                nfile += file_system_count(mount_info[1]);
                                break;
                        }
-                       item = strtok(NULL, ",");
+                       item = strtok_r(NULL, ",", &saveptr);
                }
 
                /* Exclude mount points without the seclabel option */
--

2.43.0