summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-10-15 15:42:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-23 16:30:36 +0100
commit45a97bccf667a7bb6b8b7f2e7ad2ce234000cff8 (patch)
treed8250ce6138b3c89f5c70f09ab3e622145632234 /meta/recipes-support
parentcf775f56b9dcfb9afafc338aea08b84b158c0001 (diff)
downloadpoky-45a97bccf667a7bb6b8b7f2e7ad2ce234000cff8.tar.gz
libgcrypt: fix CVE-2019-12904
In Libgcrypt 1.8.4, the C implementation of AES is vulnerable to a flush-and-reload side-channel attack because physical addresses are available to other processes. (The C implementation is used on platforms where an assembly-language implementation is unavailable.) Reference: https://nvd.nist.gov/vuln/detail/CVE-2019-12904 Patches from: https://github.com/gpg/libgcrypt/commit/1374254c2904ab5b18ba4a890856824a102d4705 https://github.com/gpg/libgcrypt/commit/daedbbb5541cd8ecda1459d3b843ea4d92788762 https://github.com/gpg/libgcrypt/commit/a4c561aab1014c3630bc88faf6f5246fee16b020 (From OE-Core rev: 37e390ff05b6a4509019db358ed496731d80cc51) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch90
-rw-r--r--meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch332
-rw-r--r--meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch178
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb3
4 files changed, 603 insertions, 0 deletions
diff --git a/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch b/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch
new file mode 100644
index 0000000000..4df96f0011
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/0001-Prefetch-GCM-look-up-tables.patch
@@ -0,0 +1,90 @@
1From 1374254c2904ab5b18ba4a890856824a102d4705 Mon Sep 17 00:00:00 2001
2From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
3Date: Sat, 27 Apr 2019 19:33:28 +0300
4Subject: [PATCH 1/3] Prefetch GCM look-up tables
5
6* cipher/cipher-gcm.c (prefetch_table, do_prefetch_tables)
7(prefetch_tables): New.
8(ghash_internal): Call prefetch_tables.
9--
10
11Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
12
13Upstream-Status: Backport
14[https://github.com/gpg/libgcrypt/commit/1374254c2904ab5b18ba4a890856824a102d4705]
15
16CVE: CVE-2019-12904
17
18Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
19---
20 cipher/cipher-gcm.c | 33 +++++++++++++++++++++++++++++++++
21 1 file changed, 33 insertions(+)
22
23diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c
24index c19f09f..11f119a 100644
25--- a/cipher/cipher-gcm.c
26+++ b/cipher/cipher-gcm.c
27@@ -118,6 +118,34 @@ static const u16 gcmR[256] = {
28 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe,
29 };
30
31+static inline
32+void prefetch_table(const void *tab, size_t len)
33+{
34+ const volatile byte *vtab = tab;
35+ size_t i;
36+
37+ for (i = 0; i < len; i += 8 * 32)
38+ {
39+ (void)vtab[i + 0 * 32];
40+ (void)vtab[i + 1 * 32];
41+ (void)vtab[i + 2 * 32];
42+ (void)vtab[i + 3 * 32];
43+ (void)vtab[i + 4 * 32];
44+ (void)vtab[i + 5 * 32];
45+ (void)vtab[i + 6 * 32];
46+ (void)vtab[i + 7 * 32];
47+ }
48+
49+ (void)vtab[len - 1];
50+}
51+
52+static inline void
53+do_prefetch_tables (const void *gcmM, size_t gcmM_size)
54+{
55+ prefetch_table(gcmM, gcmM_size);
56+ prefetch_table(gcmR, sizeof(gcmR));
57+}
58+
59 #ifdef GCM_TABLES_USE_U64
60 static void
61 bshift (u64 * b0, u64 * b1)
62@@ -365,6 +393,8 @@ do_ghash (unsigned char *result, const unsigned char *buf, const u32 *gcmM)
63 #define fillM(c) \
64 do_fillM (c->u_mode.gcm.u_ghash_key.key, c->u_mode.gcm.gcm_table)
65 #define GHASH(c, result, buf) do_ghash (result, buf, c->u_mode.gcm.gcm_table)
66+#define prefetch_tables(c) \
67+ do_prefetch_tables(c->u_mode.gcm.gcm_table, sizeof(c->u_mode.gcm.gcm_table))
68
69 #else
70
71@@ -430,6 +460,7 @@ do_ghash (unsigned char *hsub, unsigned char *result, const unsigned char *buf)
72
73 #define fillM(c) do { } while (0)
74 #define GHASH(c, result, buf) do_ghash (c->u_mode.gcm.u_ghash_key.key, result, buf)
75+#define prefetch_tables(c) do {} while (0)
76
77 #endif /* !GCM_USE_TABLES */
78
79@@ -441,6 +472,8 @@ ghash_internal (gcry_cipher_hd_t c, byte *result, const byte *buf,
80 const unsigned int blocksize = GCRY_GCM_BLOCK_LEN;
81 unsigned int burn = 0;
82
83+ prefetch_tables (c);
84+
85 while (nblocks)
86 {
87 burn = GHASH (c, result, buf);
88--
892.7.4
90
diff --git a/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch b/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch
new file mode 100644
index 0000000000..c82c5b5c8a
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch
@@ -0,0 +1,332 @@
1From 119348dd9aa52ab229afb5e2d3342d2b76fe81bf Mon Sep 17 00:00:00 2001
2From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
3Date: Fri, 31 May 2019 17:18:09 +0300
4Subject: [PATCH 2/3] AES: move look-up tables to .data section and unshare between
5 processes
6
7* cipher/rijndael-internal.h (ATTR_ALIGNED_64): New.
8* cipher/rijndael-tables.h (encT): Move to 'enc_tables' structure.
9(enc_tables): New structure for encryption table with counters before
10and after.
11(encT): New macro.
12(dec_tables): Add counters before and after encryption table; Move
13from .rodata to .data section.
14(do_encrypt): Change 'encT' to 'enc_tables.T'.
15(do_decrypt): Change '&dec_tables' to 'dec_tables.T'.
16* cipher/cipher-gcm.c (prefetch_table): Make inline; Handle input
17with length not multiple of 256.
18(prefetch_enc, prefetch_dec): Modify pre- and post-table counters
19to unshare look-up table pages between processes.
20--
21
22GnuPG-bug-id: 4541
23Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
24
25Upstream-Status: Backport
26[https://github.com/gpg/libgcrypt/commit/daedbbb5541cd8ecda1459d3b843ea4d92788762]
27
28CVE: CVE-2019-12904
29
30Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
31---
32 cipher/rijndael-internal.h | 4 +-
33 cipher/rijndael-tables.h | 155 +++++++++++++++++++++++++--------------------
34 cipher/rijndael.c | 35 ++++++++--
35 3 files changed, 118 insertions(+), 76 deletions(-)
36
37diff --git a/cipher/rijndael-internal.h b/cipher/rijndael-internal.h
38index 160fb8c..a62d4b7 100644
39--- a/cipher/rijndael-internal.h
40+++ b/cipher/rijndael-internal.h
41@@ -29,11 +29,13 @@
42 #define BLOCKSIZE (128/8)
43
44
45-/* Helper macro to force alignment to 16 bytes. */
46+/* Helper macro to force alignment to 16 or 64 bytes. */
47 #ifdef HAVE_GCC_ATTRIBUTE_ALIGNED
48 # define ATTR_ALIGNED_16 __attribute__ ((aligned (16)))
49+# define ATTR_ALIGNED_64 __attribute__ ((aligned (64)))
50 #else
51 # define ATTR_ALIGNED_16
52+# define ATTR_ALIGNED_64
53 #endif
54
55
56diff --git a/cipher/rijndael-tables.h b/cipher/rijndael-tables.h
57index 8359470..b54d959 100644
58--- a/cipher/rijndael-tables.h
59+++ b/cipher/rijndael-tables.h
60@@ -21,80 +21,98 @@
61 /* To keep the actual implementation at a readable size we use this
62 include file to define the tables. */
63
64-static const u32 encT[256] =
65+static struct
66+{
67+ volatile u32 counter_head;
68+ u32 cacheline_align[64 / 4 - 1];
69+ u32 T[256];
70+ volatile u32 counter_tail;
71+} enc_tables ATTR_ALIGNED_64 =
72 {
73- 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
74- 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
75- 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
76- 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
77- 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
78- 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
79- 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
80- 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
81- 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
82- 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
83- 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
84- 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
85- 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
86- 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
87- 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
88- 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
89- 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
90- 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
91- 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
92- 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
93- 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
94- 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
95- 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
96- 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
97- 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
98- 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
99- 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
100- 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
101- 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
102- 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
103- 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
104- 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
105- 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
106- 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
107- 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
108- 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
109- 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
110- 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
111- 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
112- 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
113- 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
114- 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
115- 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
116- 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
117- 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
118- 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
119- 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
120- 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
121- 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
122- 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
123- 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
124- 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
125- 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
126- 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
127- 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
128- 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
129- 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
130- 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
131- 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
132- 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
133- 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
134- 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
135- 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
136- 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c
137+ 0,
138+ { 0, },
139+ {
140+ 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
141+ 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
142+ 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
143+ 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
144+ 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
145+ 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
146+ 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
147+ 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
148+ 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
149+ 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
150+ 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
151+ 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
152+ 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
153+ 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
154+ 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
155+ 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
156+ 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
157+ 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
158+ 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
159+ 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
160+ 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
161+ 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
162+ 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
163+ 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
164+ 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
165+ 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
166+ 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
167+ 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
168+ 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
169+ 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
170+ 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
171+ 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
172+ 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
173+ 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
174+ 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
175+ 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
176+ 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
177+ 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
178+ 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
179+ 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
180+ 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
181+ 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
182+ 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
183+ 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
184+ 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
185+ 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
186+ 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
187+ 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
188+ 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
189+ 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
190+ 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
191+ 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
192+ 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
193+ 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
194+ 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
195+ 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
196+ 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
197+ 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
198+ 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
199+ 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
200+ 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
201+ 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
202+ 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
203+ 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c
204+ },
205+ 0
206 };
207
208-static const struct
209+#define encT enc_tables.T
210+
211+static struct
212 {
213+ volatile u32 counter_head;
214+ u32 cacheline_align[64 / 4 - 1];
215 u32 T[256];
216 byte inv_sbox[256];
217-} dec_tables =
218+ volatile u32 counter_tail;
219+} dec_tables ATTR_ALIGNED_64 =
220 {
221+ 0,
222+ { 0, },
223 {
224 0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a,
225 0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b,
226@@ -194,7 +212,8 @@ static const struct
227 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61,
228 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26,
229 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
230- }
231+ },
232+ 0
233 };
234
235 #define decT dec_tables.T
236diff --git a/cipher/rijndael.c b/cipher/rijndael.c
237index 8637195..d0edab2 100644
238--- a/cipher/rijndael.c
239+++ b/cipher/rijndael.c
240@@ -227,11 +227,11 @@ static const char *selftest(void);
241
242
243 /* Prefetching for encryption/decryption tables. */
244-static void prefetch_table(const volatile byte *tab, size_t len)
245+static inline void prefetch_table(const volatile byte *tab, size_t len)
246 {
247 size_t i;
248
249- for (i = 0; i < len; i += 8 * 32)
250+ for (i = 0; len - i >= 8 * 32; i += 8 * 32)
251 {
252 (void)tab[i + 0 * 32];
253 (void)tab[i + 1 * 32];
254@@ -242,17 +242,37 @@ static void prefetch_table(const volatile byte *tab, size_t len)
255 (void)tab[i + 6 * 32];
256 (void)tab[i + 7 * 32];
257 }
258+ for (; i < len; i += 32)
259+ {
260+ (void)tab[i];
261+ }
262
263 (void)tab[len - 1];
264 }
265
266 static void prefetch_enc(void)
267 {
268- prefetch_table((const void *)encT, sizeof(encT));
269+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
270+ * of look-up table are shared between processes. Modifying counters also
271+ * causes checksums for pages to change and hint same-page merging algorithm
272+ * that these pages are frequently changing. */
273+ enc_tables.counter_head++;
274+ enc_tables.counter_tail++;
275+
276+ /* Prefetch look-up tables to cache. */
277+ prefetch_table((const void *)&enc_tables, sizeof(enc_tables));
278 }
279
280 static void prefetch_dec(void)
281 {
282+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
283+ * of look-up table are shared between processes. Modifying counters also
284+ * causes checksums for pages to change and hint same-page merging algorithm
285+ * that these pages are frequently changing. */
286+ dec_tables.counter_head++;
287+ dec_tables.counter_tail++;
288+
289+ /* Prefetch look-up tables to cache. */
290 prefetch_table((const void *)&dec_tables, sizeof(dec_tables));
291 }
292
293@@ -737,7 +757,7 @@ do_encrypt (const RIJNDAEL_context *ctx,
294 #ifdef USE_AMD64_ASM
295 # ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
296 return _gcry_aes_amd64_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds,
297- encT);
298+ enc_tables.T);
299 # else
300 /* Call SystemV ABI function without storing non-volatile XMM registers,
301 * as target function does not use vector instruction sets. */
302@@ -757,7 +777,8 @@ do_encrypt (const RIJNDAEL_context *ctx,
303 return ret;
304 # endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */
305 #elif defined(USE_ARM_ASM)
306- return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds, encT);
307+ return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds,
308+ enc_tables.T);
309 #else
310 return do_encrypt_fn (ctx, bx, ax);
311 #endif /* !USE_ARM_ASM && !USE_AMD64_ASM*/
312@@ -1120,7 +1141,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx,
313 #ifdef USE_AMD64_ASM
314 # ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
315 return _gcry_aes_amd64_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds,
316- &dec_tables);
317+ dec_tables.T);
318 # else
319 /* Call SystemV ABI function without storing non-volatile XMM registers,
320 * as target function does not use vector instruction sets. */
321@@ -1141,7 +1162,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx,
322 # endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */
323 #elif defined(USE_ARM_ASM)
324 return _gcry_aes_arm_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds,
325- &dec_tables);
326+ dec_tables.T);
327 #else
328 return do_decrypt_fn (ctx, bx, ax);
329 #endif /*!USE_ARM_ASM && !USE_AMD64_ASM*/
330--
3312.7.4
332
diff --git a/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch b/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch
new file mode 100644
index 0000000000..b580b7b13c
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch
@@ -0,0 +1,178 @@
1From a4c561aab1014c3630bc88faf6f5246fee16b020 Mon Sep 17 00:00:00 2001
2From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
3Date: Fri, 31 May 2019 17:27:25 +0300
4Subject: [PATCH 3/3] GCM: move look-up table to .data section and unshare
5 between processes
6
7* cipher/cipher-gcm.c (ATTR_ALIGNED_64): New.
8(gcmR): Move to 'gcm_table' structure.
9(gcm_table): New structure for look-up table with counters before and
10after.
11(gcmR): New macro.
12(prefetch_table): Handle input with length not multiple of 256.
13(do_prefetch_tables): Modify pre- and post-table counters to unshare
14look-up table pages between processes.
15--
16
17GnuPG-bug-id: 4541
18Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
19
20Upstream-Status: Backport
21[https://github.com/gpg/libgcrypt/commit/a4c561aab1014c3630bc88faf6f5246fee16b020]
22
23CVE: CVE-2019-12904
24
25Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
26---
27 cipher/cipher-gcm.c | 106 ++++++++++++++++++++++++++++++++++------------------
28 1 file changed, 70 insertions(+), 36 deletions(-)
29
30diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c
31index 11f119a..194e2ec 100644
32--- a/cipher/cipher-gcm.c
33+++ b/cipher/cipher-gcm.c
34@@ -30,6 +30,14 @@
35 #include "./cipher-internal.h"
36
37
38+/* Helper macro to force alignment to 16 or 64 bytes. */
39+#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED
40+# define ATTR_ALIGNED_64 __attribute__ ((aligned (64)))
41+#else
42+# define ATTR_ALIGNED_64
43+#endif
44+
45+
46 #ifdef GCM_USE_INTEL_PCLMUL
47 extern void _gcry_ghash_setup_intel_pclmul (gcry_cipher_hd_t c);
48
49@@ -83,40 +91,54 @@ ghash_armv7_neon (gcry_cipher_hd_t c, byte *result, const byte *buf,
50
51
52 #ifdef GCM_USE_TABLES
53-static const u16 gcmR[256] = {
54- 0x0000, 0x01c2, 0x0384, 0x0246, 0x0708, 0x06ca, 0x048c, 0x054e,
55- 0x0e10, 0x0fd2, 0x0d94, 0x0c56, 0x0918, 0x08da, 0x0a9c, 0x0b5e,
56- 0x1c20, 0x1de2, 0x1fa4, 0x1e66, 0x1b28, 0x1aea, 0x18ac, 0x196e,
57- 0x1230, 0x13f2, 0x11b4, 0x1076, 0x1538, 0x14fa, 0x16bc, 0x177e,
58- 0x3840, 0x3982, 0x3bc4, 0x3a06, 0x3f48, 0x3e8a, 0x3ccc, 0x3d0e,
59- 0x3650, 0x3792, 0x35d4, 0x3416, 0x3158, 0x309a, 0x32dc, 0x331e,
60- 0x2460, 0x25a2, 0x27e4, 0x2626, 0x2368, 0x22aa, 0x20ec, 0x212e,
61- 0x2a70, 0x2bb2, 0x29f4, 0x2836, 0x2d78, 0x2cba, 0x2efc, 0x2f3e,
62- 0x7080, 0x7142, 0x7304, 0x72c6, 0x7788, 0x764a, 0x740c, 0x75ce,
63- 0x7e90, 0x7f52, 0x7d14, 0x7cd6, 0x7998, 0x785a, 0x7a1c, 0x7bde,
64- 0x6ca0, 0x6d62, 0x6f24, 0x6ee6, 0x6ba8, 0x6a6a, 0x682c, 0x69ee,
65- 0x62b0, 0x6372, 0x6134, 0x60f6, 0x65b8, 0x647a, 0x663c, 0x67fe,
66- 0x48c0, 0x4902, 0x4b44, 0x4a86, 0x4fc8, 0x4e0a, 0x4c4c, 0x4d8e,
67- 0x46d0, 0x4712, 0x4554, 0x4496, 0x41d8, 0x401a, 0x425c, 0x439e,
68- 0x54e0, 0x5522, 0x5764, 0x56a6, 0x53e8, 0x522a, 0x506c, 0x51ae,
69- 0x5af0, 0x5b32, 0x5974, 0x58b6, 0x5df8, 0x5c3a, 0x5e7c, 0x5fbe,
70- 0xe100, 0xe0c2, 0xe284, 0xe346, 0xe608, 0xe7ca, 0xe58c, 0xe44e,
71- 0xef10, 0xeed2, 0xec94, 0xed56, 0xe818, 0xe9da, 0xeb9c, 0xea5e,
72- 0xfd20, 0xfce2, 0xfea4, 0xff66, 0xfa28, 0xfbea, 0xf9ac, 0xf86e,
73- 0xf330, 0xf2f2, 0xf0b4, 0xf176, 0xf438, 0xf5fa, 0xf7bc, 0xf67e,
74- 0xd940, 0xd882, 0xdac4, 0xdb06, 0xde48, 0xdf8a, 0xddcc, 0xdc0e,
75- 0xd750, 0xd692, 0xd4d4, 0xd516, 0xd058, 0xd19a, 0xd3dc, 0xd21e,
76- 0xc560, 0xc4a2, 0xc6e4, 0xc726, 0xc268, 0xc3aa, 0xc1ec, 0xc02e,
77- 0xcb70, 0xcab2, 0xc8f4, 0xc936, 0xcc78, 0xcdba, 0xcffc, 0xce3e,
78- 0x9180, 0x9042, 0x9204, 0x93c6, 0x9688, 0x974a, 0x950c, 0x94ce,
79- 0x9f90, 0x9e52, 0x9c14, 0x9dd6, 0x9898, 0x995a, 0x9b1c, 0x9ade,
80- 0x8da0, 0x8c62, 0x8e24, 0x8fe6, 0x8aa8, 0x8b6a, 0x892c, 0x88ee,
81- 0x83b0, 0x8272, 0x8034, 0x81f6, 0x84b8, 0x857a, 0x873c, 0x86fe,
82- 0xa9c0, 0xa802, 0xaa44, 0xab86, 0xaec8, 0xaf0a, 0xad4c, 0xac8e,
83- 0xa7d0, 0xa612, 0xa454, 0xa596, 0xa0d8, 0xa11a, 0xa35c, 0xa29e,
84- 0xb5e0, 0xb422, 0xb664, 0xb7a6, 0xb2e8, 0xb32a, 0xb16c, 0xb0ae,
85- 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe,
86-};
87+static struct
88+{
89+ volatile u32 counter_head;
90+ u32 cacheline_align[64 / 4 - 1];
91+ u16 R[256];
92+ volatile u32 counter_tail;
93+} gcm_table ATTR_ALIGNED_64 =
94+ {
95+ 0,
96+ { 0, },
97+ {
98+ 0x0000, 0x01c2, 0x0384, 0x0246, 0x0708, 0x06ca, 0x048c, 0x054e,
99+ 0x0e10, 0x0fd2, 0x0d94, 0x0c56, 0x0918, 0x08da, 0x0a9c, 0x0b5e,
100+ 0x1c20, 0x1de2, 0x1fa4, 0x1e66, 0x1b28, 0x1aea, 0x18ac, 0x196e,
101+ 0x1230, 0x13f2, 0x11b4, 0x1076, 0x1538, 0x14fa, 0x16bc, 0x177e,
102+ 0x3840, 0x3982, 0x3bc4, 0x3a06, 0x3f48, 0x3e8a, 0x3ccc, 0x3d0e,
103+ 0x3650, 0x3792, 0x35d4, 0x3416, 0x3158, 0x309a, 0x32dc, 0x331e,
104+ 0x2460, 0x25a2, 0x27e4, 0x2626, 0x2368, 0x22aa, 0x20ec, 0x212e,
105+ 0x2a70, 0x2bb2, 0x29f4, 0x2836, 0x2d78, 0x2cba, 0x2efc, 0x2f3e,
106+ 0x7080, 0x7142, 0x7304, 0x72c6, 0x7788, 0x764a, 0x740c, 0x75ce,
107+ 0x7e90, 0x7f52, 0x7d14, 0x7cd6, 0x7998, 0x785a, 0x7a1c, 0x7bde,
108+ 0x6ca0, 0x6d62, 0x6f24, 0x6ee6, 0x6ba8, 0x6a6a, 0x682c, 0x69ee,
109+ 0x62b0, 0x6372, 0x6134, 0x60f6, 0x65b8, 0x647a, 0x663c, 0x67fe,
110+ 0x48c0, 0x4902, 0x4b44, 0x4a86, 0x4fc8, 0x4e0a, 0x4c4c, 0x4d8e,
111+ 0x46d0, 0x4712, 0x4554, 0x4496, 0x41d8, 0x401a, 0x425c, 0x439e,
112+ 0x54e0, 0x5522, 0x5764, 0x56a6, 0x53e8, 0x522a, 0x506c, 0x51ae,
113+ 0x5af0, 0x5b32, 0x5974, 0x58b6, 0x5df8, 0x5c3a, 0x5e7c, 0x5fbe,
114+ 0xe100, 0xe0c2, 0xe284, 0xe346, 0xe608, 0xe7ca, 0xe58c, 0xe44e,
115+ 0xef10, 0xeed2, 0xec94, 0xed56, 0xe818, 0xe9da, 0xeb9c, 0xea5e,
116+ 0xfd20, 0xfce2, 0xfea4, 0xff66, 0xfa28, 0xfbea, 0xf9ac, 0xf86e,
117+ 0xf330, 0xf2f2, 0xf0b4, 0xf176, 0xf438, 0xf5fa, 0xf7bc, 0xf67e,
118+ 0xd940, 0xd882, 0xdac4, 0xdb06, 0xde48, 0xdf8a, 0xddcc, 0xdc0e,
119+ 0xd750, 0xd692, 0xd4d4, 0xd516, 0xd058, 0xd19a, 0xd3dc, 0xd21e,
120+ 0xc560, 0xc4a2, 0xc6e4, 0xc726, 0xc268, 0xc3aa, 0xc1ec, 0xc02e,
121+ 0xcb70, 0xcab2, 0xc8f4, 0xc936, 0xcc78, 0xcdba, 0xcffc, 0xce3e,
122+ 0x9180, 0x9042, 0x9204, 0x93c6, 0x9688, 0x974a, 0x950c, 0x94ce,
123+ 0x9f90, 0x9e52, 0x9c14, 0x9dd6, 0x9898, 0x995a, 0x9b1c, 0x9ade,
124+ 0x8da0, 0x8c62, 0x8e24, 0x8fe6, 0x8aa8, 0x8b6a, 0x892c, 0x88ee,
125+ 0x83b0, 0x8272, 0x8034, 0x81f6, 0x84b8, 0x857a, 0x873c, 0x86fe,
126+ 0xa9c0, 0xa802, 0xaa44, 0xab86, 0xaec8, 0xaf0a, 0xad4c, 0xac8e,
127+ 0xa7d0, 0xa612, 0xa454, 0xa596, 0xa0d8, 0xa11a, 0xa35c, 0xa29e,
128+ 0xb5e0, 0xb422, 0xb664, 0xb7a6, 0xb2e8, 0xb32a, 0xb16c, 0xb0ae,
129+ 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe,
130+ },
131+ 0
132+ };
133+
134+#define gcmR gcm_table.R
135
136 static inline
137 void prefetch_table(const void *tab, size_t len)
138@@ -124,7 +146,7 @@ void prefetch_table(const void *tab, size_t len)
139 const volatile byte *vtab = tab;
140 size_t i;
141
142- for (i = 0; i < len; i += 8 * 32)
143+ for (i = 0; len - i >= 8 * 32; i += 8 * 32)
144 {
145 (void)vtab[i + 0 * 32];
146 (void)vtab[i + 1 * 32];
147@@ -135,6 +157,10 @@ void prefetch_table(const void *tab, size_t len)
148 (void)vtab[i + 6 * 32];
149 (void)vtab[i + 7 * 32];
150 }
151+ for (; i < len; i += 32)
152+ {
153+ (void)vtab[i];
154+ }
155
156 (void)vtab[len - 1];
157 }
158@@ -142,8 +168,16 @@ void prefetch_table(const void *tab, size_t len)
159 static inline void
160 do_prefetch_tables (const void *gcmM, size_t gcmM_size)
161 {
162+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
163+ * of look-up table are shared between processes. Modifying counters also
164+ * causes checksums for pages to change and hint same-page merging algorithm
165+ * that these pages are frequently changing. */
166+ gcm_table.counter_head++;
167+ gcm_table.counter_tail++;
168+
169+ /* Prefetch look-up tables to cache. */
170 prefetch_table(gcmM, gcmM_size);
171- prefetch_table(gcmR, sizeof(gcmR));
172+ prefetch_table(&gcm_table, sizeof(gcm_table));
173 }
174
175 #ifdef GCM_TABLES_USE_U64
176--
1772.7.4
178
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb
index fda68a2938..11d078d44a 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.4.bb
@@ -21,6 +21,9 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
21 file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \ 21 file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
22 file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \ 22 file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
23 file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ 23 file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
24 file://0001-Prefetch-GCM-look-up-tables.patch \
25 file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \
26 file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \
24" 27"
25SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573" 28SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573"
26SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227" 29SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227"