upstream commit

Remove pattern length argument from match_pattern_list(), we
 only ever use it for strlen(pattern).

Prompted by hanno AT hboeck.de pointing an out-of-bound read
error caused by an incorrect pattern length found using AFL
and his own tools.

ok markus@

1 files changed, 3 insertions, 3 deletions

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index d943efa1e..e103b70af 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.47 2015/02/17 00:14:05 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.49 2015/05/04 06:10:48 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -127,8 +127,8 @@ userauth_pubkey(Authctxt *authctxt)
                 logit("refusing previously-used %s key", key_type(key));
                 goto done;
         }
-        if (match_pattern_list(sshkey_ssh_name(key), options.pubkey_key_types,
-            strlen(options.pubkey_key_types), 0) != 1) {
+        if (match_pattern_list(sshkey_ssh_name(key),
+            options.pubkey_key_types, 0) != 1) {
                 logit("%s: key type %s not in PubkeyAcceptedKeyTypes",
                     __func__, sshkey_ssh_name(key));
                 goto done;