ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sock/ssl: move SSL_CTX creation to accept()

Browse Source 
This will allow to have context per connection.
And free context when connection closes.

Fixes #2689

Change-Id: Ic4e9adfa3f1bd8574b9ccf75ff42c4f3bd442b26
Signed-off-by: Boris Glimcher <Boris.Glimcher@emc.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14443
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Boris Glimcher 2022-09-10 02:28:04 +03:00 committed by Tomasz Zawadzki
parent 35f7f0ce1e
commit 2de485346e
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
module/sock/posix/posix.c
View File

@ -886,15 +886,6 @@ retry:
continue; continue;
} }
if (type == SPDK_SOCK_CREATE_LISTEN) { if (type == SPDK_SOCK_CREATE_LISTEN) {
if (enable_ssl) {
ctx = posix_sock_create_ssl_context(TLS_server_method(), opts, &impl_opts);
if (!ctx) {
SPDK_ERRLOG("posix_sock_create_ssl_context() failed, errno = %d\n", errno);
close(fd);
fd = -1;
break;
}
}
rc = bind(fd, res->ai_addr, res->ai_addrlen); rc = bind(fd, res->ai_addr, res->ai_addrlen);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("bind() failed at port %d, errno = %d\n", port, errno); SPDK_ERRLOG("bind() failed at port %d, errno = %d\n", port, errno);
@ -1003,7 +994,7 @@ posix_sock_connect(const char *ip, int port, struct spdk_sock_opts *opts)
} }
static struct spdk_sock * static struct spdk_sock *
posix_sock_accept(struct spdk_sock *_sock) _posix_sock_accept(struct spdk_sock *_sock, bool enable_ssl)
{ {
struct spdk_posix_sock *sock = __posix_sock(_sock); struct spdk_posix_sock *sock = __posix_sock(_sock);
struct sockaddr_storage sa; struct sockaddr_storage sa;
@ -1011,6 +1002,7 @@ posix_sock_accept(struct spdk_sock *_sock)
int rc, fd; int rc, fd;
struct spdk_posix_sock *new_sock; struct spdk_posix_sock *new_sock;
int flag; int flag;
SSL_CTX *ctx = 0;
SSL *ssl = 0; SSL *ssl = 0;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
@ -1045,11 +1037,18 @@ posix_sock_accept(struct spdk_sock *_sock)
#endif #endif
/* Establish SSL connection */ /* Establish SSL connection */
if (sock->ctx) { if (enable_ssl) {
ssl = ssl_sock_accept_loop(sock->ctx, fd, &sock->base.impl_opts); ctx = posix_sock_create_ssl_context(TLS_server_method(), &sock->base.opts, &sock->base.impl_opts);
if (!ctx) {
SPDK_ERRLOG("posix_sock_create_ssl_context() failed, errno = %d\n", errno);
close(fd);
return NULL;
}
ssl = ssl_sock_accept_loop(ctx, fd, &sock->base.impl_opts);
if (!ssl) { if (!ssl) {
SPDK_ERRLOG("ssl_sock_accept_loop() failed, errno = %d\n", errno); SPDK_ERRLOG("ssl_sock_accept_loop() failed, errno = %d\n", errno);
close(fd); close(fd);
SSL_CTX_free(ctx);
return NULL; return NULL;
} }
} }
@ -1058,11 +1057,13 @@ posix_sock_accept(struct spdk_sock *_sock)
new_sock = posix_sock_alloc(fd, &sock->base.impl_opts, sock->zcopy); new_sock = posix_sock_alloc(fd, &sock->base.impl_opts, sock->zcopy);
if (new_sock == NULL) { if (new_sock == NULL) {
close(fd); close(fd);
SSL_free(ssl);
SSL_CTX_free(ctx);
return NULL; return NULL;
} }
if (sock->ctx) { if (ctx) {
new_sock->ctx = sock->ctx; new_sock->ctx = ctx;
} }
if (ssl) { if (ssl) {
@ -1072,6 +1073,12 @@ posix_sock_accept(struct spdk_sock *_sock)
return &new_sock->base; return &new_sock->base;
} }
static struct spdk_sock *
posix_sock_accept(struct spdk_sock *_sock)
{
return _posix_sock_accept(_sock, false);
}
static int static int
posix_sock_close(struct spdk_sock *_sock) posix_sock_close(struct spdk_sock *_sock)
{ {
@ -1085,6 +1092,7 @@ posix_sock_close(struct spdk_sock *_sock)
close(sock->fd); close(sock->fd);
SSL_free(sock->ssl); SSL_free(sock->ssl);
SSL_CTX_free(sock->ctx);
spdk_pipe_destroy(sock->recv_pipe); spdk_pipe_destroy(sock->recv_pipe);
free(sock->recv_buf); free(sock->recv_buf);
@ -2023,12 +2031,18 @@ ssl_sock_connect(const char *ip, int port, struct spdk_sock_opts *opts)
return posix_sock_create(ip, port, SPDK_SOCK_CREATE_CONNECT, opts, true); return posix_sock_create(ip, port, SPDK_SOCK_CREATE_CONNECT, opts, true);
} }
static struct spdk_sock *
ssl_sock_accept(struct spdk_sock *_sock)
{
return _posix_sock_accept(_sock, true);
}
static struct spdk_net_impl g_ssl_net_impl = { static struct spdk_net_impl g_ssl_net_impl = {
.name = "ssl", .name = "ssl",
.getaddr = posix_sock_getaddr, .getaddr = posix_sock_getaddr,
.connect = ssl_sock_connect, .connect = ssl_sock_connect,
.listen = ssl_sock_listen, .listen = ssl_sock_listen,
.accept = posix_sock_accept, .accept = ssl_sock_accept,
.close = posix_sock_close, .close = posix_sock_close,
.recv = posix_sock_recv, .recv = posix_sock_recv,
.readv = posix_sock_readv, .readv = posix_sock_readv,