diff --git a/backport-ioctl-add-the-memory-free-operation-after-send_ioctl.patch b/backport-ioctl-add-the-memory-free-operation-after-send_ioctl.patch deleted file mode 100644 index 96720c112a51b1ec915367dfa4eafabbba7a579f..0000000000000000000000000000000000000000 --- a/backport-ioctl-add-the-memory-free-operation-after-send_ioctl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8fd02a2f5bd552894ef415b7e5c525be6bc6c3e3 Mon Sep 17 00:00:00 2001 -From: Jie Wang -Date: Mon, 7 Mar 2022 16:08:56 +0800 -Subject: [PATCH] ioctl: add the memory free operation after send_ioctl call - fails - -The memory is not freed after send_ioctl fails in function do_gtunable and -do_stunable. This will cause memory leaks. - -So this patch adds memory free operation after send_ioctl call fails. - -Fixes: b717ed22d984 ("ethtool: add support for get/set ethtool_tunable") -Signed-off-by: Jie Wang ---- - ethtool.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ethtool.c b/ethtool.c -index 28ecf69..4f5c234 100644 ---- a/ethtool.c -+++ b/ethtool.c -@@ -5097,6 +5097,7 @@ static int do_stunable(struct cmd_context *ctx) - ret = send_ioctl(ctx, tuna); - if (ret) { - perror(tunable_strings[tuna->id]); -+ free(tuna); - return ret; - } - free(tuna); -@@ -5174,6 +5175,7 @@ static int do_gtunable(struct cmd_context *ctx) - ret = send_ioctl(ctx, tuna); - if (ret) { - fprintf(stderr, "%s: Cannot get tunable\n", ts); -+ free(tuna); - return ret; - } - print_tunable(tuna); --- -2.33.0 - diff --git a/ethtool-5.15.tar.xz b/ethtool-5.15.tar.xz deleted file mode 100644 index c2cfaf47783d3fd74cbb312e543f94cdbeb16bc9..0000000000000000000000000000000000000000 Binary files a/ethtool-5.15.tar.xz and /dev/null differ diff --git a/ethtool-5.19.tar.xz b/ethtool-5.19.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..5f8c2a89c18ae4f925d711fcbc03bf30b1adba35 Binary files /dev/null and b/ethtool-5.19.tar.xz differ diff --git a/ethtool.spec b/ethtool.spec index ba9c9c353eb9fd06df47d79e973b98e55038bd93..b633e72a2f651776fdc76bfd9fb42e5eb1777b7c 100644 --- a/ethtool.spec +++ b/ethtool.spec @@ -1,13 +1,12 @@ Name: ethtool Epoch: 2 -Version: 5.15 -Release: 2 +Version: 5.19 +Release: 1 Summary: Settings tool for Ethernet NICs License: GPLv2 URL: https://www.kernel.org/pub/software/network/ethtool Source0: https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz -Patch0: backport-ioctl-add-the-memory-free-operation-after-send_ioctl.patch BuildRequires: gcc BuildRequires: libmnl-devel @@ -55,6 +54,12 @@ make check %{_mandir}/man8/%{name}.8* %changelog +* Tue Sep 6 2022 xuguangmin - 2:5.19-1 +- Type:requirement +- Id:NA +- SUG:NA +- DESC:update ethtool version to 5.19 + * Fri Sep 02 2022 gaihuiying - 2:5.15-2 - Type:bugfix - Id:NA