Skip to contentSkip to conversation

char random: fix boot id uniqueness race (v3)

PATCH In review Mathieu Desnoyers 2 participants 2 messages Feb 15, 2012 Random number driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 char random: fix boot id uniqueness race (v3)

The proc file /proc/sys/kernel/random/boot_id can be read concurrently by user-space processes. If two (or more) user-space processes concurrently read boot_id when sysctl_bootid is not yet assigned, a race can occur making boot_id differ between the reads. Because the whole point of the boot id is to be unique across a kernel execution, fix this by protecting this operation with a spinlock.

Given that this operation is not frequently used, hitting the spinlock on each call should not be an issue.

* Changelog since v1:
- boot_id_mutex is now declared within the proc_do_uuid scope.
- added explanation for memory barriers.

* Changelog since v2:
- simplify: use spinlock on all paths, suggested by Eric Dumazet.

CC "Theodore Ts'o" <[email protected]>
CC Matt Mackall <[email protected]>
CC Eric Dumazet <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
---
 drivers/char/random.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/char/random.c +8 -3
Index: linux-2.6-lttng/drivers/char/random.c
===================================================================
@@ -1250,10 +1250,15 @@ static int proc_do_uuid(ctl_table *table
 	uuid = table->data;
 	if (!uuid) {
 		uuid = tmp_uuid;
-		uuid[8] = 0;
-	}
-	if (uuid[8] == 0)
 		generate_random_uuid(uuid);
+	} else {
+		static DEFINE_SPINLOCK(bootid_spinlock);
+
+		spin_lock(&bootid_spinlock);
+		if (!uuid[8])
+			generate_random_uuid(uuid);
+		spin_unlock(&bootid_spinlock);
+	}
 
 	sprintf(buf, "%pU", uuid);
 
Signature · 4 lines
Mathieu Desnoyers
Operating System Efficiency R&D Consultant
EfficiOS Inc.
http://www.efficios.com
#1 lore raw
Quoted 40 lines · Mathieu Desnoyers

The proc file /proc/sys/kernel/random/boot_id can be read concurrently by user-space processes. If two (or more) user-space processes concurrently read boot_id when sysctl_bootid is not yet assigned, a race can occur making boot_id differ between the reads. Because the whole point of the boot id is to be unique across a kernel execution, fix this by protecting this operation with a spinlock.

Given that this operation is not frequently used, hitting the spinlock on each call should not be an issue.

* Changelog since v1:
- boot_id_mutex is now declared within the proc_do_uuid scope.
- added explanation for memory barriers.

* Changelog since v2:
- simplify: use spinlock on all paths, suggested by Eric Dumazet.

CC "Theodore Ts'o" <[email protected]>
CC Matt Mackall <[email protected]>
CC Eric Dumazet <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
---
 drivers/char/random.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Index: linux-2.6-lttng/drivers/char/random.c
===================================================================

drivers/char/random.c +1 -3
@@ -1250,10 +1250,15 @@ static int proc_do_uuid(ctl_table *table
 	uuid = table->data;
 	if (!uuid) {
 		uuid = tmp_uuid;
-		uuid[8] = 0;
-	}
-	if (uuid[8] == 0)
 		generate_random_uuid(uuid);
+	} else {

drivers/char/random.c static int proc_do_uuid(ctl_table *table · line 1264

Quoted 10 lines
drivers/char/random.c +7 -0
+		static DEFINE_SPINLOCK(bootid_spinlock);
+
+		spin_lock(&bootid_spinlock);
+		if (!uuid[8])
+			generate_random_uuid(uuid);
+		spin_unlock(&bootid_spinlock);
+	}
 
 	sprintf(buf, "%pU", uuid);
 

Thanks Mathieu !