From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 8 Mar 2019 17:24:43 +0000 (+0000)
Subject: upstream: fix use-after-free in ssh-pkcs11; found by hshoexer w/AFL
X-Git-Tag: V_8_0_P1~23
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2aee9a49f668092ac5c9d34e904ef7a9722e541d;p=thirdparty%2Fopenssh-portable.git

upstream: fix use-after-free in ssh-pkcs11; found by hshoexer w/AFL

OpenBSD-Commit-ID: febce81cca72b71f70513fbee4ff52ca050f675c
---

diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index a1a2bab45..70f06bffe 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.42 2019/02/04 23:37:54 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.43 2019/03/08 17:24:43 markus Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -1124,6 +1124,7 @@ pkcs11_fetch_certs(struct pkcs11_provider *p, CK_ULONG slotidx,
 			break;
 		default:
 			/* XXX print key type? */
+			key = NULL;
 			error("skipping unsupported certificate type");
 		}
 
@@ -1225,6 +1226,7 @@ pkcs11_fetch_keys(struct pkcs11_provider *p, CK_ULONG slotidx,
 #endif /* HAVE_EC_KEY_METHOD_NEW */
 		default:
 			/* XXX print key type? */
+			key = NULL;
 			error("skipping unsupported key type");
 		}