import UBI iputils-20210202-15.el9_7
This commit is contained in:
parent
d07101b6f6
commit
8ea5b39c57
38
SOURCES/014-ping-Make-ping_rts-struct-static.patch
Normal file
38
SOURCES/014-ping-Make-ping_rts-struct-static.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 68bdc8e127f1f02aa742b324d1cf3c89d251e13b Mon Sep 17 00:00:00 2001
|
||||
From: Petr Vorel <pvorel@suse.cz>
|
||||
Date: Tue, 20 Sep 2022 22:23:44 +0200
|
||||
Subject: [PATCH] ping: Make ping_rts struct static
|
||||
|
||||
This allows accessing global_rts->exiting in sigexit() signal handler
|
||||
after main() has exited. Problem occurred on aarch64, which occasionally
|
||||
delivered signal after main() has exited, which causes segfault.
|
||||
|
||||
Fixes: b3a41a6 ("ping: move global variables to runtime config structure")
|
||||
Fixes: https://github.com/iputils/iputils/issues/423
|
||||
Closes: https://github.com/iputils/iputils/pull/425
|
||||
|
||||
Reported-by: linzhanglong
|
||||
Suggested-by: Cyril Hrubis <chrubis@suse.cz>
|
||||
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
|
||||
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||||
(cherry picked from commit 7861af993bf47fccaf37c5659d66c09832844ae3)
|
||||
---
|
||||
ping/ping.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ping/ping.c b/ping/ping.c
|
||||
index ff7e742..19913e6 100644
|
||||
--- a/ping/ping.c
|
||||
+++ b/ping/ping.c
|
||||
@@ -263,7 +263,7 @@ main(int argc, char **argv)
|
||||
socket_st sock6 = { .fd = -1 };
|
||||
char *target;
|
||||
char *outpack_fill = NULL;
|
||||
- struct ping_rts rts = {
|
||||
+ static struct ping_rts rts = {
|
||||
.interval = 1000,
|
||||
.preload = 1,
|
||||
.lingertime = MAXWAIT * 1000,
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
From 475ac9971a1808b7a9876f738f734834ed9a291e Mon Sep 17 00:00:00 2001
|
||||
From: Petr Vorel <pvorel@suse.cz>
|
||||
Date: Tue, 28 May 2024 10:58:59 +0200
|
||||
Subject: [PATCH] arping: Fix exit code if receive more replies than sent
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
ARP protocol, unlike ICMP protocol, has no way to link REQUEST and REPLY
|
||||
together (detect to which sender belongs the response). E.g. running
|
||||
more arping instances currently causes failure due receiving more
|
||||
replies than sent probes:
|
||||
|
||||
# ./builddir/arping -c2 -I eth0 192.168.255.1 -w10 &
|
||||
# ./builddir/arping -c2 -I eth0 192.168.255.1 -w10 &
|
||||
ARPING 192.168.255.1 from 192.168.255.133 eth0
|
||||
ARPING 192.168.255.1 from 192.168.255.133 eth0
|
||||
Unicast reply from 192.168.255.1 [50:EB:F6:87:9D:D0] 1.722ms
|
||||
Unicast reply from 192.168.255.1 [50:EB:F6:87:9D:D0] 1.726ms
|
||||
Unicast reply from 192.168.255.1 [50:EB:F6:87:9D:D0] 1.910ms
|
||||
Unicast reply from 192.168.255.1 [50:EB:F6:87:9D:D0] 1.915ms
|
||||
Sent 1 probes (1 broadcast(s))
|
||||
Sent 1 probes (1 broadcast(s))
|
||||
Received 2 response(s)
|
||||
Received 2 response(s)
|
||||
[ ENTER ]
|
||||
[1]- Exit 1 ./builddir/arping -c2 -I eth0 192.168.255.1 -w10
|
||||
[2]+ Exit 1 ./builddir/arping -c2 -I eth0 192.168.255.1 -w10
|
||||
|
||||
84ca65c (fix for 67e070d) introduced this regression.
|
||||
|
||||
Later e594ca5 introduced more precise timing - before arping sent 2
|
||||
probes instead of 1 with -w1.
|
||||
|
||||
Then 854873b unified behavior with ping, i.e. using -w (deadline)
|
||||
*without* -c (count) exit 0 if at least one reply arrived (backwards
|
||||
incompatibility, also now incompatible with busybox). But that still
|
||||
kept problematic using -w with -c on multiple instances / replies.
|
||||
|
||||
Fixing the problem by adding a special condition.
|
||||
|
||||
Also, when at it, move all exit code evaluation into finish() (before
|
||||
it was in finish() but also event_loop()). This improves code introduced
|
||||
in 67e070d.
|
||||
|
||||
Fixes: 84ca65c ("arping: fix sent vs received packages return value")
|
||||
Fixes: https://github.com/iputils/iputils/issues/538
|
||||
Closes: https://github.com/iputils/iputils/pull/546
|
||||
Reported-by: Mingyang Liu <papillon@yeah.net>
|
||||
Tested-by: Mingyang Liu <papillon@yeah.net>
|
||||
Reviewed-by: Clemens Famulla-Conrad <cfamullaconrad@suse.com>
|
||||
Reviewed-by: <Michał Sieroń michalwsieron@gmail.com>
|
||||
Tested-by: <Michał Sieroń michalwsieron@gmail.com>
|
||||
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
||||
(cherry picked from commit b589819d820a037c3492b2766eabc0c5bc011de7)
|
||||
---
|
||||
arping.c | 28 +++++++++++++---------------
|
||||
1 file changed, 13 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/arping.c b/arping.c
|
||||
index 6f94e90..8b4f54e 100644
|
||||
--- a/arping.c
|
||||
+++ b/arping.c
|
||||
@@ -297,11 +297,18 @@ static int finish(struct run_state *ctl)
|
||||
printf("\n");
|
||||
fflush(stdout);
|
||||
}
|
||||
+
|
||||
+ /* arping exit code evaluation */
|
||||
if (ctl->dad)
|
||||
- return (!!ctl->received);
|
||||
+ return !!ctl->received;
|
||||
+
|
||||
if (ctl->unsolicited)
|
||||
return 0;
|
||||
- return (!ctl->received);
|
||||
+
|
||||
+ if (ctl->timeout && ctl->count > 0 && !ctl->quit_on_reply)
|
||||
+ return !(ctl->count <= ctl->received);
|
||||
+
|
||||
+ return !ctl->received;
|
||||
}
|
||||
|
||||
static void print_hex(unsigned char *p, int len)
|
||||
@@ -665,7 +672,7 @@ static void find_broadcast_address(struct run_state *ctl)
|
||||
|
||||
static int event_loop(struct run_state *ctl)
|
||||
{
|
||||
- int exit_loop = 0, rc = 0;
|
||||
+ int exit_loop = 0;
|
||||
ssize_t s;
|
||||
enum {
|
||||
POLLFD_SIGNAL = 0,
|
||||
@@ -806,7 +813,7 @@ static int event_loop(struct run_state *ctl)
|
||||
(struct sockaddr *)&from, &addr_len)) < 0) {
|
||||
error(0, errno, "recvfrom");
|
||||
if (errno == ENETDOWN)
|
||||
- rc = 2;
|
||||
+ return 2;
|
||||
continue;
|
||||
}
|
||||
if (recv_pack
|
||||
@@ -822,17 +829,8 @@ static int event_loop(struct run_state *ctl)
|
||||
close(sfd);
|
||||
close(tfd);
|
||||
freeifaddrs(ctl->ifa0);
|
||||
- rc |= finish(ctl);
|
||||
- if (ctl->unsolicited)
|
||||
- /* nothing */;
|
||||
- else if (ctl->dad && ctl->quit_on_reply)
|
||||
- /* Duplicate address detection mode return value */
|
||||
- rc |= !(ctl->brd_sent != ctl->received);
|
||||
- else if (ctl->timeout && !(ctl->count > 0))
|
||||
- rc |= !(ctl->received > 0);
|
||||
- else
|
||||
- rc |= (ctl->sent != ctl->received);
|
||||
- return rc;
|
||||
+
|
||||
+ return finish(ctl);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 339a45dd8a2dc6b17f4c1dda97b84c4af1a5bbad Mon Sep 17 00:00:00 2001
|
||||
From 0cf586cb9e60ace9b25bef4e862edc0f98925849 Mon Sep 17 00:00:00 2001
|
||||
From: Cyril Hrubis <metan@ucw.cz>
|
||||
Date: Fri, 16 May 2025 17:57:10 +0200
|
||||
Subject: [PATCH] ping: Fix moving average rtt calculation
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: Network monitoring tools including ping
|
||||
Name: iputils
|
||||
Version: 20210202
|
||||
Release: 11%{?dist}.3
|
||||
Release: 15%{?dist}
|
||||
# some parts are under the original BSD (ping.c)
|
||||
# some are under GPLv2+ (tracepath.c)
|
||||
License: BSD and GPLv2+
|
||||
@ -32,7 +32,9 @@ Patch010: 010-ping-Fix-socket-error-reporting.patch
|
||||
Patch011: 011-ping-Fix-ping6-binding-to-VRF-and-address.patch
|
||||
Patch012: 012-ping6-Avoid-binding-to-non-VRF.patch
|
||||
Patch013: 013-ping-Fix-signed-64-bit-integer-overflow-in-RTT-calcu.patch
|
||||
Patch014: 014-ping-Fix-moving-average-rtt-calculation.patch
|
||||
Patch014: 014-ping-Make-ping_rts-struct-static.patch
|
||||
Patch015: 015-arping-Fix-exit-code-if-receive-more-replies-than-se.patch
|
||||
Patch016: 016-ping-Fix-moving-average-rtt-calculation.patch
|
||||
|
||||
# Downstream-only patches
|
||||
Patch100: 100-iputils-ifenslave.patch
|
||||
@ -143,14 +145,17 @@ install -cp ifenslave.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/
|
||||
%attr(644,root,root) %{_mandir}/man8/ninfod.8.gz
|
||||
|
||||
%changelog
|
||||
* Fri Sep 19 2025 Jan Macku <jamacku@redhat.com> - 20210202-11.3
|
||||
- Bump release
|
||||
* Fri Sep 12 2025 Jan Macku <jamacku@redhat.com> - 20210202-15
|
||||
- Fix CVE-2025-48964 iputils: iputils integer overflow (RHEL-112000)
|
||||
|
||||
* Fri Sep 12 2025 Jan Macku <jamacku@redhat.com> - 20210202-11.2
|
||||
- Fix CVE-2025-48964 iputils: iputils integer overflow (RHEL-112001)
|
||||
* Fri Jun 20 2025 Jan Macku <jamacku@redhat.com> - 20210202-14
|
||||
- arping: Fix exit code if receive more replies than sent (RHEL-98281)
|
||||
|
||||
* Thu Jun 05 2025 Jan Macku <jamacku@redhat.com> - 20210202-11.1
|
||||
- Fix CVE-2025-47268 iputils: Signed Integer Overflow in Timestamp Multiplication in iputils ping (RHEL-94335)
|
||||
* Thu Jun 19 2025 Jan Macku <jamacku@redhat.com> - 20210202-13
|
||||
- Fix ping hangs under ASan on aarch64 (RHEL-96871)
|
||||
|
||||
* Tue Jun 03 2025 Jan Macku <jamacku@redhat.com> - 20210202-12
|
||||
- Fix CVE-2025-47268 iputils: Signed Integer Overflow in Timestamp Multiplication in iputils ping (RHEL-94334)
|
||||
|
||||
* Fri Sep 06 2024 Jan Macku <jamacku@redhat.com> - 20210202-11
|
||||
- ping: Fix ping6 binding to VRF and address (RHEL-57734)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user