summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch')
-rw-r--r--meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch330
1 files changed, 330 insertions, 0 deletions
diff --git a/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch b/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch
new file mode 100644
index 0000000000..0cb503ed65
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/CVE-2019-12904_p2.patch
@@ -0,0 +1,330 @@
1From a5c359cc68a4def9bf39f63070837d89711b4e17 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] AES: move look-up tables to .data section and unshare between processes
5Reply-To: shuagr@microsoft.com
6
7CVE: CVE-2019-12904_p2
8Upstream-status: Backport
9Signed-off-by: Shubham Agrawal<shuagr@microsoft.com>
10Upstream-commit: https://github.com/gpg/libgcrypt/commit/daedbbb5541cd8ecda1459d3b843ea4d92788762
11
12* cipher/rijndael-internal.h (ATTR_ALIGNED_64): New.
13* cipher/rijndael-tables.h (encT): Move to 'enc_tables' structure.
14(enc_tables): New structure for encryption table with counters before
15and after.
16(encT): New macro.
17(dec_tables): Add counters before and after encryption table; Move
18from .rodata to .data section.
19(do_encrypt): Change 'encT' to 'enc_tables.T'.
20(do_decrypt): Change '&dec_tables' to 'dec_tables.T'.
21* cipher/cipher-gcm.c (prefetch_table): Make inline; Handle input
22with length not multiple of 256.
23(prefetch_enc, prefetch_dec): Modify pre- and post-table counters
24to unshare look-up table pages between processes.
25--
26
27GnuPG-bug-id: 4541
28Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
29---
30 cipher/rijndael-internal.h | 4 +-
31 cipher/rijndael-tables.h | 155 +++++++++++++++++++++++++--------------------
32 cipher/rijndael.c | 35 ++++++++--
33 3 files changed, 118 insertions(+), 76 deletions(-)
34
35diff --git a/cipher/rijndael-internal.h b/cipher/rijndael-internal.h
36index 160fb8c..a62d4b7 100644
37--- a/cipher/rijndael-internal.h
38+++ b/cipher/rijndael-internal.h
39@@ -29,11 +29,13 @@
40 #define BLOCKSIZE (128/8)
41
42
43-/* Helper macro to force alignment to 16 bytes. */
44+/* Helper macro to force alignment to 16 or 64 bytes. */
45 #ifdef HAVE_GCC_ATTRIBUTE_ALIGNED
46 # define ATTR_ALIGNED_16 __attribute__ ((aligned (16)))
47+# define ATTR_ALIGNED_64 __attribute__ ((aligned (64)))
48 #else
49 # define ATTR_ALIGNED_16
50+# define ATTR_ALIGNED_64
51 #endif
52
53
54diff --git a/cipher/rijndael-tables.h b/cipher/rijndael-tables.h
55index 8359470..b54d959 100644
56--- a/cipher/rijndael-tables.h
57+++ b/cipher/rijndael-tables.h
58@@ -21,80 +21,98 @@
59 /* To keep the actual implementation at a readable size we use this
60 include file to define the tables. */
61
62-static const u32 encT[256] =
63+static struct
64+{
65+ volatile u32 counter_head;
66+ u32 cacheline_align[64 / 4 - 1];
67+ u32 T[256];
68+ volatile u32 counter_tail;
69+} enc_tables ATTR_ALIGNED_64 =
70 {
71- 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
72- 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
73- 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
74- 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
75- 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
76- 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
77- 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
78- 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
79- 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
80- 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
81- 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
82- 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
83- 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
84- 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
85- 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
86- 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
87- 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
88- 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
89- 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
90- 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
91- 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
92- 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
93- 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
94- 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
95- 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
96- 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
97- 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
98- 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
99- 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
100- 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
101- 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
102- 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
103- 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
104- 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
105- 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
106- 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
107- 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
108- 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
109- 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
110- 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
111- 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
112- 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
113- 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
114- 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
115- 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
116- 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
117- 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
118- 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
119- 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
120- 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
121- 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
122- 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
123- 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
124- 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
125- 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
126- 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
127- 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
128- 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
129- 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
130- 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
131- 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
132- 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
133- 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
134- 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c
135+ 0,
136+ { 0, },
137+ {
138+ 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
139+ 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
140+ 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
141+ 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
142+ 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
143+ 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
144+ 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
145+ 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
146+ 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
147+ 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
148+ 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
149+ 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
150+ 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
151+ 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
152+ 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
153+ 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
154+ 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
155+ 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
156+ 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
157+ 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
158+ 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
159+ 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
160+ 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
161+ 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
162+ 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
163+ 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
164+ 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
165+ 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
166+ 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
167+ 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
168+ 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
169+ 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
170+ 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
171+ 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
172+ 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
173+ 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
174+ 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
175+ 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
176+ 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
177+ 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
178+ 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
179+ 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
180+ 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
181+ 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
182+ 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
183+ 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
184+ 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
185+ 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
186+ 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
187+ 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
188+ 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
189+ 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
190+ 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
191+ 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
192+ 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
193+ 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
194+ 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
195+ 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
196+ 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
197+ 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
198+ 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
199+ 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
200+ 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
201+ 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c
202+ },
203+ 0
204 };
205
206-static const struct
207+#define encT enc_tables.T
208+
209+static struct
210 {
211+ volatile u32 counter_head;
212+ u32 cacheline_align[64 / 4 - 1];
213 u32 T[256];
214 byte inv_sbox[256];
215-} dec_tables =
216+ volatile u32 counter_tail;
217+} dec_tables ATTR_ALIGNED_64 =
218 {
219+ 0,
220+ { 0, },
221 {
222 0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a,
223 0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b,
224@@ -194,7 +212,8 @@ static const struct
225 0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61,
226 0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26,
227 0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
228- }
229+ },
230+ 0
231 };
232
233 #define decT dec_tables.T
234diff --git a/cipher/rijndael.c b/cipher/rijndael.c
235index 8637195..d0edab2 100644
236--- a/cipher/rijndael.c
237+++ b/cipher/rijndael.c
238@@ -227,11 +227,11 @@ static const char *selftest(void);
239
240
241 /* Prefetching for encryption/decryption tables. */
242-static void prefetch_table(const volatile byte *tab, size_t len)
243+static inline void prefetch_table(const volatile byte *tab, size_t len)
244 {
245 size_t i;
246
247- for (i = 0; i < len; i += 8 * 32)
248+ for (i = 0; len - i >= 8 * 32; i += 8 * 32)
249 {
250 (void)tab[i + 0 * 32];
251 (void)tab[i + 1 * 32];
252@@ -242,17 +242,37 @@ static void prefetch_table(const volatile byte *tab, size_t len)
253 (void)tab[i + 6 * 32];
254 (void)tab[i + 7 * 32];
255 }
256+ for (; i < len; i += 32)
257+ {
258+ (void)tab[i];
259+ }
260
261 (void)tab[len - 1];
262 }
263
264 static void prefetch_enc(void)
265 {
266- prefetch_table((const void *)encT, sizeof(encT));
267+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
268+ * of look-up table are shared between processes. Modifying counters also
269+ * causes checksums for pages to change and hint same-page merging algorithm
270+ * that these pages are frequently changing. */
271+ enc_tables.counter_head++;
272+ enc_tables.counter_tail++;
273+
274+ /* Prefetch look-up tables to cache. */
275+ prefetch_table((const void *)&enc_tables, sizeof(enc_tables));
276 }
277
278 static void prefetch_dec(void)
279 {
280+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
281+ * of look-up table are shared between processes. Modifying counters also
282+ * causes checksums for pages to change and hint same-page merging algorithm
283+ * that these pages are frequently changing. */
284+ dec_tables.counter_head++;
285+ dec_tables.counter_tail++;
286+
287+ /* Prefetch look-up tables to cache. */
288 prefetch_table((const void *)&dec_tables, sizeof(dec_tables));
289 }
290
291@@ -737,7 +757,7 @@ do_encrypt (const RIJNDAEL_context *ctx,
292 #ifdef USE_AMD64_ASM
293 # ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
294 return _gcry_aes_amd64_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds,
295- encT);
296+ enc_tables.T);
297 # else
298 /* Call SystemV ABI function without storing non-volatile XMM registers,
299 * as target function does not use vector instruction sets. */
300@@ -757,7 +777,8 @@ do_encrypt (const RIJNDAEL_context *ctx,
301 return ret;
302 # endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */
303 #elif defined(USE_ARM_ASM)
304- return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds, encT);
305+ return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds,
306+ enc_tables.T);
307 #else
308 return do_encrypt_fn (ctx, bx, ax);
309 #endif /* !USE_ARM_ASM && !USE_AMD64_ASM*/
310@@ -1120,7 +1141,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx,
311 #ifdef USE_AMD64_ASM
312 # ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
313 return _gcry_aes_amd64_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds,
314- &dec_tables);
315+ dec_tables.T);
316 # else
317 /* Call SystemV ABI function without storing non-volatile XMM registers,
318 * as target function does not use vector instruction sets. */
319@@ -1141,7 +1162,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx,
320 # endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */
321 #elif defined(USE_ARM_ASM)
322 return _gcry_aes_arm_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds,
323- &dec_tables);
324+ dec_tables.T);
325 #else
326 return do_decrypt_fn (ctx, bx, ax);
327 #endif /*!USE_ARM_ASM && !USE_AMD64_ASM*/
328--
3292.7.4
330
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 05:51:22 +0000