mirror of https://gerrit.osmocom.org/libosmocore
osmo_io_uring: Detach msghdr from iofd before calling iofd_handle_send_completion()
msghdr must be detached, because subsequent callback at iofd_handle_send_completion() may destroy the iofd (which in turn frees this msghdr, if still attached) and frees the msghdr, causing a double free. Related: OS#5751 Change-Id: Ia349f73de2145fa360b20dd40deb73a8ffc71f07
This commit is contained in:
parent
ae7607be21
commit
23b1158bf1
|
@ -195,6 +195,13 @@ static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc)
|
|||
{
|
||||
struct osmo_io_fd *iofd = msghdr->iofd;
|
||||
|
||||
/* Detach msghdr from iofd. It might get freed here or at iofd_handle_send_completion().
|
||||
* If there is pending data to sent, iofd_uring_submit_tx will attach it again.
|
||||
* msghdr must be detached here, because subsequent callback at iofd_handle_send_completion() may destroy the
|
||||
* iofd (which in turn frees this msghdr, if still attached) and frees the msghdr, causing a double free. */
|
||||
if (iofd->u.uring.write_msghdr == msghdr)
|
||||
iofd->u.uring.write_msghdr = NULL;
|
||||
|
||||
if (OSMO_UNLIKELY(IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))) {
|
||||
msgb_free(msghdr->msg);
|
||||
iofd_msghdr_free(msghdr);
|
||||
|
@ -202,7 +209,6 @@ static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc)
|
|||
iofd_handle_send_completion(iofd, rc, msghdr);
|
||||
}
|
||||
|
||||
iofd->u.uring.write_msghdr = NULL;
|
||||
/* submit the next to-be-transmitted message for this file descriptor */
|
||||
if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
|
||||
iofd_uring_submit_tx(iofd);
|
||||
|
|
Loading…
Reference in New Issue