upstream: Don't leak SK device. Patch from Pedro Martelletto via

github PR#316. ok djm@

OpenBSD-Commit-ID: 17d11327545022e727d95fd08b213171c5a4585d

diff --git a/sk-usbhid.c b/sk-usbhid.c
index 2d36ac337ffa3e9f14b81ad0f1f80299c11772a9..2d58c7836b421c6bd15fa160b4eb0be1c04f12a5 100644 (file)
--- a/sk-usbhid.c
+++ b/sk-usbhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sk-usbhid.c,v 1.38 2022/02/07 01:25:12 djm Exp $ */
+/* $OpenBSD: sk-usbhid.c,v 1.39 2022/04/29 03:16:48 dtucker Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl
  * Copyright (c) 2020 Pedro Martelletto
@@ -1393,6 +1393,7 @@ sk_load_resident_keys(const char *pin, struct sk_option **options,
                freezero(rks[i]->user_id, rks[i]->user_id_len);
                freezero(rks[i], sizeof(*rks[i]));
        }
+       free(device);
        free(rks);
        return ret;
 }

diff --git a/ssh-sk-helper.c b/ssh-sk-helper.c
index b1d22631f2f6ee42ee7f5854d3c43b0efa388366..bd9b410a697464dc6bf7b3488cb5834f5b8bf9f3 100644 (file)
--- a/ssh-sk-helper.c
+++ b/ssh-sk-helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-sk-helper.c,v 1.12 2021/10/28 02:54:18 djm Exp $ */
+/* $OpenBSD: ssh-sk-helper.c,v 1.13 2022/04/29 03:16:48 dtucker Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -265,6 +265,7 @@ process_load_resident(struct sshbuf *req)
        sshsk_free_resident_keys(srks, nsrks);
        sshbuf_free(kbuf);
        free(provider);
+       free(device);
        if (pin != NULL)
                freezero(pin, strlen(pin));
        return resp;