Steven Rostedt (VMware)
85f4f12d51
vsprintf: Replace memory barrier with static_key for random_ptr_key update
...
Reviewing Tobin's patches for getting pointers out early before
entropy has been established, I noticed that there's a lone smp_mb() in
the code. As with most lone memory barriers, this one appears to be
incorrectly used.
We currently basically have this:
get_random_bytes(&ptr_key, sizeof(ptr_key));
/*
* have_filled_random_ptr_key==true is dependent on get_random_bytes().
* ptr_to_id() needs to see have_filled_random_ptr_key==true
* after get_random_bytes() returns.
*/
smp_mb();
WRITE_ONCE(have_filled_random_ptr_key, true);
And later we have:
if (unlikely(!have_filled_random_ptr_key))
return string(buf, end, "(ptrval)", spec);
/* Missing memory barrier here. */
hashval = (unsigned long)siphash_1u64((u64)ptr, &ptr_key);
As the CPU can perform speculative loads, we could have a situation
with the following:
CPU0 CPU1
---- ----
load ptr_key = 0
store ptr_key = random
smp_mb()
store have_filled_random_ptr_key
load have_filled_random_ptr_key = true
BAD BAD BAD! (you're so bad!)
Because nothing prevents CPU1 from loading ptr_key before loading
have_filled_random_ptr_key.
But this race is very unlikely, but we can't keep an incorrect smp_mb() in
place. Instead, replace the have_filled_random_ptr_key with a static_branch
not_filled_random_ptr_key, that is initialized to true and changed to false
when we get enough entropy. If the update happens in early boot, the
static_key is updated immediately, otherwise it will have to wait till
entropy is filled and this happens in an interrupt handler which can't
enable a static_key, as that requires a preemptible context. In that case, a
work_queue is used to enable it, as entropy already took too long to
establish in the first place waiting a little more shouldn't hurt anything.
The benefit of using the static key is that the unlikely branch in
vsprintf() now becomes a nop.
Link: http://lkml.kernel.org/r/20180515100558.21df515e@gandalf.local.home
Cc: stable@vger.kernel.org
Fixes: ad67b74d24 ("printk: hash addresses printed with %p")
Acked-by: Linus Torvalds <torvalds@linux-foundation.org >
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org >
2018-05-16 09:01:41 -04:00
..
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-10-03 17:54:25 -07:00
2017-11-02 11:10:55 +01:00
2017-12-22 19:39:09 +11:00
2018-04-07 12:08:19 -07:00
2008-04-18 22:17:17 -04:00
2017-10-12 15:10:12 +02:00
2015-09-10 13:29:01 -07:00
2017-05-08 17:15:12 -07:00
2018-03-26 02:01:27 +09:00
2012-10-08 13:50:18 +10:30
2017-11-02 11:10:55 +01:00
2017-12-01 13:09:40 -08:00
2017-12-01 13:09:40 -08:00
2017-12-08 15:13:27 +00:00
2017-12-04 10:52:56 -08:00
2017-07-14 15:05:13 -07:00
locking/atomic: Implement atomic{,64,_long}_fetch_{add,sub,and,andnot,or,xor}{,_relaxed,_acquire,_release}()
2016-06-16 10:48:32 +02:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2011-03-11 14:25:50 +00:00
2018-04-05 21:36:21 -07:00
2014-12-22 16:43:06 +00:00
2017-07-10 16:32:35 -07:00
2018-03-14 16:55:29 -07:00
2017-12-11 09:58:39 -05:00
2018-03-09 16:40:01 -08:00
2013-06-19 17:54:06 +02:00
2017-11-02 11:10:55 +01:00
2018-01-12 23:03:01 +11:00
2017-11-02 11:10:55 +01:00
2016-03-13 23:55:13 -04:00
2014-04-03 16:21:12 -07:00
2017-11-02 11:10:55 +01:00
2017-09-08 18:26:49 -07:00
2017-12-01 13:09:40 -08:00
2017-11-02 11:10:55 +01:00
2011-10-29 21:20:22 +02:00
2015-05-27 15:22:15 +02:00
2018-02-06 18:32:44 -08:00
2017-09-26 15:01:20 -06:00
2014-05-16 14:26:52 -04:00
2017-09-26 15:01:20 -06:00
2017-09-26 15:01:20 -06:00
2017-11-02 11:10:55 +01:00
2017-02-24 17:46:57 -08:00
2018-01-08 10:08:33 +00:00
2015-05-26 15:26:43 +02:00
2015-05-30 22:42:24 -07:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2013-06-26 12:10:56 +02:00
2018-03-14 20:20:01 +01:00
2017-11-02 11:10:55 +01:00
2015-09-10 13:29:01 -07:00
2017-11-02 11:10:55 +01:00
2017-02-24 17:46:57 -08:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2015-09-10 13:29:01 -07:00
2017-11-02 11:10:55 +01:00
2018-03-15 18:08:55 +01:00
2017-10-12 17:16:40 +01:00
2017-11-13 08:25:06 -08:00
2018-02-22 15:02:33 -08:00
2018-04-23 14:43:27 +02:00
2017-11-02 11:10:55 +01:00
2018-03-15 13:25:36 +01:00
2017-11-17 16:10:01 -08:00
2017-11-15 11:56:19 -08:00
2016-06-08 11:04:19 +02:00
2018-01-12 17:33:38 -08:00
2018-04-27 08:51:26 -04:00
2017-07-10 16:32:35 -07:00
2017-08-10 15:54:06 -07:00
2014-04-30 19:49:37 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2012-07-23 13:54:52 +01:00
2018-05-11 17:28:45 -07:00
2018-02-06 18:32:44 -08:00
2014-01-21 23:17:20 -08:00
2017-11-02 11:10:55 +01:00
2017-10-07 10:45:14 -06:00
2017-11-02 11:10:55 +01:00
2017-11-17 16:10:02 -08:00
2017-02-24 17:46:57 -08:00
2017-02-24 17:46:57 -08:00
2017-09-08 18:26:49 -07:00
2017-11-02 11:10:55 +01:00
2018-02-26 14:39:30 -05:00
2017-11-02 11:10:55 +01:00
2018-02-04 10:17:21 +00:00
2017-11-17 16:10:02 -08:00
2015-02-12 18:54:15 -08:00
2016-01-20 17:09:18 -08:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2018-03-22 17:07:01 -07:00
2017-10-11 22:36:54 -04:00
2017-11-02 11:10:55 +01:00
2012-03-07 15:04:04 -05:00
2017-03-02 08:42:38 +01:00
2012-05-02 00:04:06 -07:00
2017-11-02 11:10:55 +01:00
2018-03-21 17:18:34 -05:00
2018-04-11 10:28:35 -07:00
2018-02-06 18:32:47 -08:00
2017-05-16 08:44:22 -03:00
2018-04-11 10:28:35 -07:00
2018-03-27 11:15:42 +02:00
2016-02-07 22:18:47 -08:00
2018-03-27 13:18:09 -04:00
2018-04-23 13:14:55 +02:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2015-03-31 09:45:50 -06:00
2018-03-26 15:09:38 +02:00
2018-04-11 10:28:35 -07:00
2017-11-02 11:10:55 +01:00
2017-10-25 11:01:08 +02:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2018-04-12 09:41:19 -07:00
2018-03-21 17:18:34 -05:00
2015-11-25 09:22:02 -07:00
2017-12-01 13:09:40 -08:00
2018-04-11 10:28:35 -07:00
2012-07-30 17:25:22 -07:00
2017-11-02 11:10:55 +01:00
2017-12-01 13:09:40 -08:00
2017-11-02 11:10:55 +01:00
2015-12-03 11:49:23 -05:00
2017-12-07 14:00:57 -05:00
2017-11-17 16:10:02 -08:00
2017-11-02 11:10:55 +01:00
2013-04-09 14:13:05 -04:00
2017-11-02 11:10:55 +01:00
2012-12-14 10:32:52 +11:00
2017-12-08 15:13:28 +00:00
2017-11-04 09:26:51 +09:00
2017-02-03 16:35:42 -05:00
2016-12-06 10:17:03 +02:00
2018-01-26 11:45:16 -06:00
2017-11-02 11:10:55 +01:00
2017-03-02 08:42:34 +01:00
2013-11-13 12:09:11 +09:00
2018-03-19 10:09:44 -07:00
2017-03-02 08:42:27 +01:00
2012-07-30 17:25:22 -07:00
2017-01-23 09:17:12 +01:00
2018-04-11 10:28:39 -07:00
2017-11-21 15:57:05 -08:00
2017-10-03 17:54:26 -07:00
2017-11-02 11:10:55 +01:00
2017-11-17 16:10:02 -08:00
2017-12-14 16:00:48 -08:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2018-03-31 23:25:39 -04:00
2018-02-28 12:23:35 -07:00
2018-03-30 22:50:15 +02:00
2017-11-02 11:10:55 +01:00
2016-04-15 16:53:14 -04:00
2015-08-24 14:28:01 -06:00
2017-11-02 11:10:55 +01:00
2018-04-13 17:10:28 -07:00
2017-02-22 16:41:30 -08:00
2017-01-09 13:58:57 -05:00
2018-01-05 15:24:00 +01:00
2017-11-02 11:10:55 +01:00
2018-02-06 18:32:44 -08:00
2015-02-12 18:54:16 -08:00
2017-09-13 18:53:16 -07:00
2018-02-01 12:20:21 -08:00
2017-11-02 11:10:55 +01:00
2017-11-02 11:10:55 +01:00
2018-05-12 11:57:37 +02:00
2017-11-02 11:10:55 +01:00
2018-04-11 10:28:35 -07:00
2018-03-29 14:33:29 -04:00
2017-09-08 18:26:49 -07:00
2018-04-05 21:36:27 -07:00
2016-09-01 17:52:01 -07:00
2016-01-20 17:09:18 -08:00
2018-04-11 10:28:32 -07:00
2018-03-09 16:40:02 -08:00
2017-11-17 16:10:01 -08:00
2014-01-23 16:36:57 -08:00
2017-02-26 11:03:38 -05:00
2017-11-29 12:09:02 +11:00
2018-03-07 10:44:03 -05:00
2017-01-09 13:58:57 -05:00
2018-02-06 18:32:45 -08:00
2015-08-03 11:51:12 +02:00
2016-02-09 10:27:29 +01:00
2017-11-17 16:10:01 -08:00
2017-07-12 16:26:00 -07:00
2018-04-11 10:28:35 -07:00
2018-03-26 15:55:57 +02:00
2017-07-21 09:38:30 +02:00
2015-09-10 13:29:01 -07:00
2016-02-03 08:28:43 -08:00
2018-04-16 18:53:13 -04:00
2017-12-29 23:13:10 +01:00
2008-07-08 02:37:54 -07:00
2017-10-22 03:14:07 +01:00
2017-10-22 03:14:07 +01:00
2018-02-06 18:32:46 -08:00
2018-02-06 18:32:46 -08:00
2017-12-01 13:09:40 -08:00
2017-11-02 11:10:55 +01:00
2017-12-11 09:35:11 -05:00
2017-12-11 15:03:08 -07:00
2018-05-16 09:01:41 -04:00
2017-11-02 11:10:55 +01:00
2017-08-15 09:02:07 -07:00