Skip to content

Commit

Permalink
upstream: actually use the length parameter that was passed in rather
Browse files Browse the repository at this point in the history
than a constant (this makes no difference in practice because the length is
always the same); reported by martin AT nmkd.net

OpenBSD-Commit-ID: 4aecce232c2fe9b16e9217ff6bcb3c848d853e7e
  • Loading branch information
djmdjm committed Aug 20, 2024
1 parent d922762 commit 2b17621
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sshkey.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.c,v 1.144 2024/08/20 03:48:30 djm Exp $ */
/* $OpenBSD: sshkey.c,v 1.145 2024/08/20 11:10:04 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
Expand Down Expand Up @@ -747,15 +747,15 @@ sshkey_prekey_alloc(u_char **prekeyp, size_t len)

*prekeyp = NULL;
#if defined(MAP_CONCEAL)
if ((prekey = mmap(NULL, SSHKEY_SHIELD_PREKEY_LEN, PROT_READ|PROT_WRITE,
if ((prekey = mmap(NULL, len, PROT_READ|PROT_WRITE,
MAP_ANON|MAP_PRIVATE|MAP_CONCEAL, -1, 0)) == MAP_FAILED)
return SSH_ERR_SYSTEM_ERROR;
#elif defined(MAP_NOCORE)
if ((prekey = mmap(NULL, SSHKEY_SHIELD_PREKEY_LEN, PROT_READ|PROT_WRITE,
if ((prekey = mmap(NULL, len, PROT_READ|PROT_WRITE,
MAP_ANON|MAP_PRIVATE|MAP_NOCORE, -1, 0)) == MAP_FAILED)
return SSH_ERR_SYSTEM_ERROR;
#elif defined(MADV_DONTDUMP)
if ((prekey = mmap(NULL, SSHKEY_SHIELD_PREKEY_LEN, PROT_READ|PROT_WRITE,
if ((prekey = mmap(NULL, len, PROT_READ|PROT_WRITE,
MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
return SSH_ERR_SYSTEM_ERROR;
(void)madvise(prekey, len, MADV_DONTDUMP);
Expand Down

0 comments on commit 2b17621

Please sign in to comment.