]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Check pointer for NULL before deref.
authordtucker@openbsd.org <dtucker@openbsd.org>
Tue, 14 Mar 2023 07:26:25 +0000 (07:26 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Tue, 14 Mar 2023 07:35:31 +0000 (18:35 +1100)
None of the existing callers seem to do that, but it's worth checking.
From Coverity CID 291834, ok djm@

OpenBSD-Commit-ID: a0a97113f192a7cb1a2c97b932f677f573cda7a4

authfile.c

index 9ed4f4c3a30dd286dab8995e210570dbb07ecf08..445f2dd541988b1345a7c523c1501f21aae7d3c9 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.143 2022/06/21 14:52:13 tobhe Exp $ */
+/* $OpenBSD: authfile.c,v 1.144 2023/03/14 07:26:25 dtucker Exp $ */
 /*
  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
  *
@@ -211,6 +211,8 @@ sshkey_try_load_public(struct sshkey **kp, const char *filename,
        int r;
        struct sshkey *k = NULL;
 
+       if (kp == NULL)
+               return SSH_ERR_INVALID_ARGUMENT;
        *kp = NULL;
        if (commentp != NULL)
                *commentp = NULL;