Skip to contentSkip to conversation

Patch "nospec: Include <asm/barrier.h> dependency" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2018 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

nospec: Include <asm/barrier.h> dependency

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nospec-include-asm-barrier.h-dependency.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From eb6174f6d1be16b19cfa43dac296bfed003ce1a6 Mon Sep 17 00:00:00 2001

From: Dan Williams <[email protected]>
Date: Fri, 16 Feb 2018 13:20:54 -0800
Subject: nospec: Include <asm/barrier.h> dependency

From: Dan Williams <[email protected]>

commit eb6174f6d1be16b19cfa43dac296bfed003ce1a6 upstream.

The nospec.h header expects the per-architecture header file <asm/barrier.h> to optionally define array_index_mask_nospec(). Include that dependency to prevent inadvertent fallback to the default array_index_mask_nospec() implementation.

The default implementation may not provide a full mitigation on architectures that perform data value speculation.

---
 include/linux/nospec.h |    1 +
 1 file changed, 1 insertion(+)
include/linux/nospec.h +1 -0
@@ -5,6 +5,7 @@
 
 #ifndef _LINUX_NOSPEC_H
 #define _LINUX_NOSPEC_H
+#include <asm/barrier.h>
 
 /**
  * array_index_mask_nospec() - generate a ~0 mask when index < size, 0 otherwise

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/nospec-include-asm-barrier.h-dependency.patch queue-4.9/x86-speculation-objtool-annotate-indirect-calls-jumps-for-objtool.patch queue-4.9/nospec-kill-array_index_nospec_mask_check.patch