Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove access() call from Snapsafe detection #2197

Merged
merged 10 commits into from
Feb 20, 2025
Merged

Remove access() call from Snapsafe detection #2197

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8fdae68
changed snapsafe detection to not use access()
smittals2 Feb 15, 2025
0f0a684
try using stat instead
smittals2 Feb 17, 2025
4a44013
add struct to store stat data
smittals2 Feb 18, 2025
9d38ba6
missing include
smittals2 Feb 18, 2025
862e651
try babis approach
smittals2 Feb 18, 2025
faf4bd9
fixed typo
smittals2 Feb 18, 2025
06cc975
cleanup
smittals2 Feb 18, 2025
aee3147
use stat
smittals2 Feb 18, 2025
f83eb44
change condition
smittals2 Feb 19, 2025
b59de10
change if condition
smittals2 Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions crypto/fipsmodule/rand/snapsafe_detect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <unistd.h>
#include "../delocate.h"

Expand All @@ -21,28 +22,18 @@ DEFINE_STATIC_ONCE(aws_snapsafe_init)
DEFINE_BSS_GET(volatile uint32_t *, sgc_addr)
DEFINE_BSS_GET(int, snapsafety_state)

// aws_snapsafe_check_kernel_support returns 1 if the special sysgenid device
// file exists and 0 otherwise.
static int aws_snapsafe_check_kernel_support(void) {
// This file-exist method is generally brittle. But for our purpose, this
// should be more than fine.
if (access(CRYPTO_get_sysgenid_path(), F_OK) != 0) {
return 0;
}
return 1;
}

static void do_aws_snapsafe_init(void) {
*snapsafety_state_bss_get() = SNAPSAFETY_STATE_NOT_SUPPORTED;
*sgc_addr_bss_get() = NULL;
*snapsafety_state_bss_get() = SNAPSAFETY_STATE_NOT_SUPPORTED;

if (aws_snapsafe_check_kernel_support() != 1) {
struct stat buff;
if (stat(CRYPTO_get_sysgenid_path(), &buff) != 0) {
return;
}
*snapsafety_state_bss_get() = SNAPSAFETY_STATE_FAILED_INITIALISE;

*snapsafety_state_bss_get() = SNAPSAFETY_STATE_FAILED_INITIALISE;
int fd_sgc = open(CRYPTO_get_sysgenid_path(), O_RDONLY);
if (fd_sgc == -1) {
if (fd_sgc < 0) {
return;
}

Expand Down
Loading