diff options
| author | Damien Miller <djm@mindrot.org> | 2024-08-20 05:55:30 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-08-20 05:55:30 +0200 |
| commit | d922762ca16a7381131b242f49d7376c41fabcb5 (patch) | |
| tree | 6bcc98890ceb021e719c5cae2fe5a149e02976c6 | |
| parent | upstream: place shielded keys (i.e. keys at rest in RAM) into memory (diff) | |
| download | openssh-d922762ca16a7381131b242f49d7376c41fabcb5.tar.xz openssh-d922762ca16a7381131b242f49d7376c41fabcb5.zip | |
private key coredump protection for Linux/FreeBSD
platforms not supporting coredump exclusion using mmap/madvise flags
fall back to plain old malloc(3).
| -rw-r--r-- | sshkey.c | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -746,9 +746,23 @@ sshkey_prekey_alloc(u_char **prekeyp, size_t len) u_char *prekey; *prekeyp = NULL; +#if defined(MAP_CONCEAL) if ((prekey = mmap(NULL, SSHKEY_SHIELD_PREKEY_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, + 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, + MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) + return SSH_ERR_SYSTEM_ERROR; + (void)madvise(prekey, len, MADV_DONTDUMP); +#else + if ((prekey = calloc(1, len)) == NULL) + return SSH_ERR_ALLOC_FAIL; +#endif *prekeyp = prekey; return 0; } @@ -758,7 +772,11 @@ sshkey_prekey_free(void *prekey, size_t len) { if (prekey == NULL) return; +#if defined(MAP_CONCEAL) || defined(MAP_NOCORE) || defined(MADV_DONTDUMP) munmap(prekey, len); +#else + freezero(prekey, len); +#endif } static void |