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.

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

tee-supplicant: send READY=1 notification to systemd #383

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions tee-supplicant/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ set(SRC
src/hmac_sha2.c
src/rpmb.c
src/sha2.c
src/sd_notify.c
src/tee_supp_fs.c
src/tee_supplicant.c
src/teec_ta_load.c
Expand Down
3 changes: 2 additions & 1 deletion tee-supplicant/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ TEES_SRCS := tee_supplicant.c \
teec_ta_load.c \
tee_supp_fs.c \
rpmb.c \
handle.c
handle.c \
sd_notify.c

ifeq ($(CFG_GP_SOCKETS),y)
TEES_SRCS += tee_socket.c
Expand Down
93 changes: 93 additions & 0 deletions tee-supplicant/src/sd_notify.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
// SPDX-License-Identifier: MIT-0
/*
* The code below is imported from:
* https://www.freedesktop.org/software/systemd/man/devel/sd_notify.html#Standalone%20Implementations
*/

#define _GNU_SOURCE 1
#include <string.h>
#include <errno.h>
#include <inttypes.h>
#include <signal.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <time.h>
#include <unistd.h>

#include "sd_notify.h"

#define _cleanup_(f) __attribute__((cleanup(f)))

static void closep(int *fd)
{
if (!fd || *fd < 0)
return;

close(*fd);
*fd = -1;
}

static int notify(const char *message)
{
union sockaddr_union {
struct sockaddr sa;
struct sockaddr_un sun;
} socket_addr = {
.sun.sun_family = AF_UNIX,
};

ssize_t written = 0;
size_t path_length, message_length = 0;
_cleanup_(closep) int fd = -1;
const char *socket_path = NULL;

/* Verify the argument first */
if (!message)
return -EINVAL;

message_length = strlen(message);
if (message_length == 0)
return -EINVAL;

/* If the variable is not set, the protocol is a noop */
socket_path = getenv("NOTIFY_SOCKET");
if (!socket_path)
return 0; /* Not set? Nothing to do */

/* Only AF_UNIX is supported, with path or abstract sockets */
if (socket_path[0] != '/' && socket_path[0] != '@')
return -EAFNOSUPPORT;

path_length = strlen(socket_path);
/* Ensure there is room for NULL byte */
if (path_length >= sizeof(socket_addr.sun.sun_path))
return -E2BIG;

memcpy(socket_addr.sun.sun_path, socket_path, path_length);

/* Support for abstract socket */
if (socket_addr.sun.sun_path[0] == '@')
socket_addr.sun.sun_path[0] = 0;

fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
if (fd < 0)
return -errno;

if (connect(fd, &socket_addr.sa, offsetof(struct sockaddr_un, sun_path) + path_length) != 0)
return -errno;

written = write(fd, message, message_length);
if (written != (ssize_t) message_length)
return written < 0 ? -errno : -EPROTO;

return 1; /* Notified! */
}

int sd_notify_ready(void)
{
return notify("READY=1");
}
11 changes: 11 additions & 0 deletions tee-supplicant/src/sd_notify.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// SPDX-License-Identifier: MIT-0
/*
* The code below is imported from:
* https://www.freedesktop.org/software/systemd/man/devel/sd_notify.html#Standalone%20Implementations
*/
#ifndef SD_NOTIFY_H
#define SD_NOTIFY_H

int sd_notify_ready(void);

#endif /* SD_NOTIFY_H */
6 changes: 6 additions & 0 deletions tee-supplicant/src/tee_supplicant.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include <tee_socket.h>
#include <tee_supp_fs.h>
#include <tee_supplicant.h>
#include <sd_notify.h>
#include <unistd.h>

#include "optee_msg_supplicant.h"
Expand Down Expand Up @@ -923,6 +924,11 @@ int main(int argc, char *argv[])
}
}

/* we are set here notify systemd */
e = sd_notify_ready();
if(e < 0)
fprintf(stderr, "sd_notify_ready() failed: %s\n", strerror(-e));

if (daemonize) {
/* Release parent */
if (write(pipefd[1], "", 1) != 1) {
Expand Down
Loading