diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-03-06 02:03:20 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2017-03-06 13:44:46 +1100 |
commit | 18501151cf272a15b5f2c5e777f2e0933633c513 (patch) | |
tree | 808149de65737b6ae09e0fe95fb9eca3c3707589 /ssh-keygen.c | |
parent | d072370793f1a20f01ad827ba8fcd3b8f2c46165 (diff) |
upstream commit
Check l->hosts before dereferencing; fixes potential null
pointer deref. ok djm@
Upstream-ID: 81c0327c6ec361da794b5c680601195cc23d1301
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index ca94fe44f..6fd1f0348 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.297 2017/03/06 00:44:51 dtucker Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.298 2017/03/06 02:03:20 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1084,7 +1084,7 @@ known_hosts_hash(struct hostkey_foreach_line *l, void *_ctx) | |||
1084 | struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; | 1084 | struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; |
1085 | char *hashed, *cp, *hosts, *ohosts; | 1085 | char *hashed, *cp, *hosts, *ohosts; |
1086 | int has_wild = l->hosts && strcspn(l->hosts, "*?!") != strlen(l->hosts); | 1086 | int has_wild = l->hosts && strcspn(l->hosts, "*?!") != strlen(l->hosts); |
1087 | int was_hashed = l->hosts[0] == HASH_DELIM; | 1087 | int was_hashed = l->hosts && l->hosts[0] == HASH_DELIM; |
1088 | 1088 | ||
1089 | switch (l->status) { | 1089 | switch (l->status) { |
1090 | case HKF_STATUS_OK: | 1090 | case HKF_STATUS_OK: |