Author: markj
Date: Mon Aug 31 15:59:17 2020
New Revision: 364995
URL: https://svnweb.freebsd.org/changeset/base/364995
Log:
ggated(8): Avoid doubly opening the requested disk device.
- Initialize the disk device fd field in connection_new().
- Close the disk device after handing the connection over
to a child worker.
- Avoid re-opening a disk device for each connection from
the same client, avoiding an fd leak.
PR: 132845
Submitted by: Yoshihiro Ota <o...@j.email.ne.jp>
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D26168
Modified:
head/sbin/ggate/ggated/ggated.c
Modified: head/sbin/ggate/ggated/ggated.c
==============================================================================
--- head/sbin/ggate/ggated/ggated.c Mon Aug 31 15:55:29 2020
(r364994)
+++ head/sbin/ggate/ggated/ggated.c Mon Aug 31 15:59:17 2020
(r364995)
@@ -349,6 +349,16 @@ exports_check(struct ggd_export *ex, struct g_gate_cin
flags = O_WRONLY;
else
flags = O_RDWR;
+ if (conn->c_diskfd != -1) {
+ if (strcmp(conn->c_path, ex->e_path) != 0) {
+ g_gate_log(LOG_ERR, "old %s and new %s: "
+ "Path mismatch during handshakes.",
+ conn->c_path, ex->e_path);
+ return (EPERM);
+ }
+ return (0);
+ }
+
conn->c_diskfd = open(ex->e_path, flags);
if (conn->c_diskfd == -1) {
error = errno;
@@ -455,7 +465,7 @@ connection_new(struct g_gate_cinit *cinit, struct sock
conn->c_token = cinit->gc_token;
ip = htonl(((struct sockaddr_in *)(void *)s)->sin_addr.s_addr);
conn->c_srcip = ip;
- conn->c_sendfd = conn->c_recvfd = -1;
+ conn->c_diskfd = conn->c_sendfd = conn->c_recvfd = -1;
if ((cinit->gc_flags & GGATE_FLAG_SEND) != 0)
conn->c_sendfd = sfd;
else
@@ -510,6 +520,8 @@ connection_remove(struct ggd_connection *conn)
LIST_REMOVE(conn, c_next);
g_gate_log(LOG_DEBUG, "Connection removed [%s %s].",
ip2str(conn->c_srcip), conn->c_path);
+ if (conn->c_diskfd != -1)
+ close(conn->c_diskfd);
if (conn->c_sendfd != -1)
close(conn->c_sendfd);
if (conn->c_recvfd != -1)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
