diff --git a/SOURCES/0001-Prevent-infinite-recursion-in-dmidecode.c-smbios_set.patch b/SOURCES/0001-Prevent-infinite-recursion-in-dmidecode.c-smbios_set.patch new file mode 100644 index 0000000..e0647d4 --- /dev/null +++ b/SOURCES/0001-Prevent-infinite-recursion-in-dmidecode.c-smbios_set.patch @@ -0,0 +1,29 @@ +From d6fa84f8a80d5e1c526fe675c345f709a700e33e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Josef=20M=C3=B6llers?= +Date: Fri, 20 Jul 2018 08:56:48 +0200 +Subject: [PATCH] Prevent infinite recursion in dmidecode.c::smbios_setslot by + (#7) + +Checking that subordinate bus has a number greater than the +current bus. +Fixes SUSE bug#1093625 +--- + src/dmidecode/dmidecode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dmidecode/dmidecode.c b/src/dmidecode/dmidecode.c +index 1d805bb..a01a6ce 100644 +--- a/src/dmidecode/dmidecode.c ++++ b/src/dmidecode/dmidecode.c +@@ -153,7 +153,7 @@ void smbios_setslot(const struct libbiosdevname_state *state, + } + + /* Found a PDEV, now is it a bridge? */ +- if (pdev->sbus != -1) { ++ if (pdev->sbus != -1 && pdev->sbus > bus) { + smbios_setslot(state, domain, pdev->sbus, -1, -1, type, slot, index, label); + } + } +-- +2.17.2 + diff --git a/SOURCES/0001-man-fix-all_ethN-indentation.patch b/SOURCES/0001-man-fix-all_ethN-indentation.patch new file mode 100644 index 0000000..c56f376 --- /dev/null +++ b/SOURCES/0001-man-fix-all_ethN-indentation.patch @@ -0,0 +1,26 @@ +From 42abae6e56f22245ac8d693ab88ad1e3ea75a220 Mon Sep 17 00:00:00 2001 +From: Dan Kenigsberg +Date: Sun, 27 Jan 2019 09:26:53 +0200 +Subject: [PATCH] man: fix all_ethN indentation + +all_ethN is not another .TP block under the physical policy, it is a paragraph of its own right. +--- + biosdevname.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/biosdevname.1 b/biosdevname.1 +index 22a53bd..643eae5 100644 +--- a/biosdevname.1 ++++ b/biosdevname.1 +@@ -60,7 +60,7 @@ for embedded NICs + pp[_] + for cards in PCI slots + .br +-.TP ++.PP + The + .B all_ethN + policy makes a best guess at what the device order should be, with +-- +2.17.2 + diff --git a/SPECS/biosdevname.spec b/SPECS/biosdevname.spec index 9735cee..4609ad3 100644 --- a/SPECS/biosdevname.spec +++ b/SPECS/biosdevname.spec @@ -1,6 +1,6 @@ Name: biosdevname Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Udev helper for naming devices per BIOS names Group: System Environment/Base @@ -24,6 +24,8 @@ Requires: udev Patch0: biosdevname-0.6.1-rules.patch Patch1: 0001-Place-udev-rules-to-usr-lib.patch Patch2: 0001-Add-support-for-ExaNIC-network-cards-5.patch +Patch3: 0001-Prevent-infinite-recursion-in-dmidecode.c-smbios_set.patch +Patch4: 0001-man-fix-all_ethN-indentation.patch %description biosdevname in its simplest form takes a kernel device name as an @@ -37,6 +39,8 @@ name (e.g. eth0). %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build autoreconf -iv @@ -60,6 +64,10 @@ make install install-data DESTDIR=%{buildroot} %changelog +* Wed Mar 27 2019 Michal Sekletár - 0.7.3-2 +- prevent infinite recursion in dmidecode.c::smbios_setslot (#1642706) +- fix indentation in the man page (#1642706) + * Wed Oct 25 2017 Michal Sekletar - 0.7.3-1 - rebase to 0.7.3 (#1467144)