Brad Bishop | 6ef3265 | 2018-10-09 18:59:25 +0100 | [diff] [blame] | 1 | From ce055269c80f6e7c1393c0deec7bc5f0d37895ea Mon Sep 17 00:00:00 2001 |
| 2 | From: Sinan Kaya <okaya@kernel.org> |
| 3 | Date: Sun, 23 Sep 2018 04:05:47 +0000 |
| 4 | Subject: [PATCH] g10: Fix filtering by PK->REQ_USAGE |
| 5 | |
| 6 | Upstream-Status: Backport [https://dev.gnupg.org/rGa17d2d1f690ebe5d005b4589a5fe378b6487c657] |
| 7 | CVE: CVE-2018-9234 |
| 8 | Signed-off-by: Sinan Kaya <okaya@kernel.org> |
| 9 | --- |
| 10 | g10/getkey.c | 2 ++ |
| 11 | 1 file changed, 2 insertions(+) |
| 12 | |
| 13 | diff --git a/g10/getkey.c b/g10/getkey.c |
| 14 | index e31e023..ca2500c 100644 |
| 15 | --- a/g10/getkey.c |
| 16 | +++ b/g10/getkey.c |
| 17 | @@ -1810,6 +1810,8 @@ get_pubkey_byfprint (ctrl_t ctrl, PKT_public_key *pk, kbnode_t *r_keyblock, |
| 18 | ctx.items[0].mode = fprint_len == 16 ? KEYDB_SEARCH_MODE_FPR16 |
| 19 | : KEYDB_SEARCH_MODE_FPR20; |
| 20 | memcpy (ctx.items[0].u.fpr, fprint, fprint_len); |
| 21 | + if (pk) |
| 22 | + ctx.req_usage = pk->req_usage; |
| 23 | rc = lookup (ctrl, &ctx, 0, &kb, &found_key); |
| 24 | if (!rc && pk) |
| 25 | pk_from_block (pk, kb, found_key); |
| 26 | -- |
| 27 | 2.19.0 |
| 28 | |