36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
From f5f56c001dddd486859dc6301e6cbe00ba604fe8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
|
|
Date: Wed, 18 Aug 2021 10:09:35 +0200
|
|
Subject: [PATCH 01/15] Retry on interrupted error in tftp
|
|
|
|
Interrupt might arrive when sending error reply. Retry if possible.
|
|
|
|
Wrong Check of Return Value
|
|
|
|
10. dnsmasq-2.85/src/tftp.c:603: check_return: Calling "sendto(transfer->sockfd, dnsmasq_daemon->packet, len, 0, __CONST_SOCKADDR_ARG({.__sockaddr__ = &peer.sa}), sa_len(&peer))" without checking return value. This library function may fail and return an error code.
|
|
# 601| prettyprint_addr(&peer, daemon->addrbuff);
|
|
# 602| len = tftp_err(ERR_TID, daemon->packet, _("ignoring packet from %s (TID mismatch)"), daemon->addrbuff);
|
|
# 603|-> sendto(transfer->sockfd, daemon->packet, len, 0, &peer.sa, sa_len(&peer));
|
|
# 604| }
|
|
# 605| }
|
|
---
|
|
src/tftp.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/tftp.c b/src/tftp.c
|
|
index 37bdff2..3d87523 100644
|
|
--- a/src/tftp.c
|
|
+++ b/src/tftp.c
|
|
@@ -600,7 +600,7 @@ void check_tftp_listeners(time_t now)
|
|
/* Wrong source address. See rfc1350 para 4. */
|
|
prettyprint_addr(&peer, daemon->addrbuff);
|
|
len = tftp_err(ERR_TID, daemon->packet, _("ignoring packet from %s (TID mismatch)"), daemon->addrbuff);
|
|
- sendto(transfer->sockfd, daemon->packet, len, 0, &peer.sa, sa_len(&peer));
|
|
+ while(retry_send(sendto(transfer->sockfd, daemon->packet, len, 0, &peer.sa, sa_len(&peer))));
|
|
}
|
|
}
|
|
}
|
|
--
|
|
2.31.1
|
|
|