[S] Change in libosmocore[master]: osmo_io: Guard osmo_iofd_register() with invalid file descriptor

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36188?usp=email ) Change subject: osmo_io: Guard osmo_iofd_register() with invalid file descriptor ...................................................................... osmo_io: Guard osmo_iofd_register() with invalid file descriptor Let's return an error if both osmo_iofd_setup() and osmo_iofd_register() are called with an invalid file descriptor like -1. Either one of them must have been called with a valid file descriptor. Change-Id: Ie4561cefad82e1bf5d37dd1a4815f4bc805343e6 --- M src/core/osmo_io.c 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 5a5e05c..f0d213c 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -672,6 +672,11 @@ if (fd >= 0) iofd->fd = fd; + else if (iofd->fd < 0) { + /* this might happen if both osmo_iofd_setup() and osmo_iofd_register() are called with -1 */ + LOGPIO(iofd, LOGL_ERROR, "Cannot register io_fd using invalid fd == %d\n", iofd->fd); + return -EBADF; + } if (osmo_iofd_ops.register_fd) rc = osmo_iofd_ops.register_fd(iofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie4561cefad82e1bf5d37dd1a4815f4bc805343e6 Gerrit-Change-Number: 36188 Gerrit-PatchSet: 2 Gerrit-Owner: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel &lt;dwillmann(a)sysmocom.de&gt; Gerrit-Reviewer: dexter &lt;pmaier(a)sysmocom.de&gt; Gerrit-Reviewer: jolly &lt;andreas(a)eversberg.eu&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged