diff --git a/qemu.spec b/qemu.spec index 631f1a24aaf7aabf3aeadb640670a432024d5b59..d11667476f9221b5a8a2dd4b046e90d435d789da 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 4.1.0 -Release: 54 +Release: 55 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -324,6 +324,7 @@ Patch0311: nvram-add-nrf51_soc-flash-read-method.patch Patch0312: spapr_pci-add-spapr-msi-read-method.patch Patch0313: tz-ppc-add-dummy-read-write-methods.patch Patch0314: imx7-ccm-add-digprog-mmio-write-method.patch +Patch0315: util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch BuildRequires: flex BuildRequires: bison @@ -713,6 +714,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Mon May 17 2021 imxcc +- util/cacheinfo: fix crash when compiling with uClibc + * Fri Mar 26 2021 Chen Qun - hw/pci-host: add pci-intack write method - pci-host: add pcie-msi read method diff --git a/util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch new file mode 100644 index 0000000000000000000000000000000000000000..797d71e73d5115ead1f4bdf6ae3ed4aabebeb572 --- /dev/null +++ b/util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch @@ -0,0 +1,45 @@ +From 00b5032eaddb7193f03f0a28b10286244d2e2a7b Mon Sep 17 00:00:00 2001 +From: Carlos Santos +Date: Thu, 17 Oct 2019 09:37:13 -0300 +Subject: [PATCH] util/cacheinfo: fix crash when compiling with uClibc + +uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE +but the corresponding sysconf calls returns -1, which is a valid result, +meaning that the limit is indeterminate. + +Handle this situation using the fallback values instead of crashing due +to an assertion failure. + +Signed-off-by: Carlos Santos +Message-Id: <20191017123713.30192-1-casantos@redhat.com> +Signed-off-by: Richard Henderson +--- + util/cacheinfo.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/util/cacheinfo.c b/util/cacheinfo.c +index ea6f3e99bf..d94dc6adc8 100644 +--- a/util/cacheinfo.c ++++ b/util/cacheinfo.c +@@ -93,10 +93,16 @@ static void sys_cache_info(int *isize, int *dsize) + static void sys_cache_info(int *isize, int *dsize) + { + # ifdef _SC_LEVEL1_ICACHE_LINESIZE +- *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE); ++ int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE); ++ if (tmp_isize > 0) { ++ *isize = tmp_isize; ++ } + # endif + # ifdef _SC_LEVEL1_DCACHE_LINESIZE +- *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); ++ int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE); ++ if (tmp_dsize > 0) { ++ *dsize = tmp_dsize; ++ } + # endif + } + #endif /* sys_cache_info */ +-- +2.27.0 +