Fix coredump caused by selinux denial

This commit is contained in:
Sam Feifer 2023-12-15 11:55:48 -05:00
parent 9a03130965
commit 51103637cb
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/pkg/framework/coremodel/helpers.go b/pkg/framework/coremodel/helpers.go
index 20d111edba..6655f81cee 100644
--- a/pkg/framework/coremodel/helpers.go
+++ b/pkg/framework/coremodel/helpers.go
@@ -26,7 +26,7 @@ func init() {
var err error
defaultFramework, err = doLoadFrameworkCUE(cuectx.ProvideCUEContext())
if err != nil {
- panic(err)
+// panic(err)
}
}

View File

@ -25,7 +25,7 @@ end}
Name: grafana
Version: 9.2.10
Release: 12%{?dist}
Release: 13%{?dist}
Summary: Metrics dashboard and graph editor
License: AGPL-3.0-only
URL: https://grafana.org
@ -78,6 +78,7 @@ Patch9: 0009-redact-weak-ciphers.patch
# https://github.com/grafana/grafana/commit/bae86dbeb0ad68a205454e98e76985dc393183d4
Patch10: 0010-skip-tests.patch
Patch11: 0011-remove-email-lookup.patch
Patch12: 0012-coredump-selinux-error.patch
# Patches affecting the vendor tarball
Patch1001: 1001-vendor-patch-removed-backend-crypto.patch
@ -762,6 +763,7 @@ cp -p %{SOURCE8} %{SOURCE9} %{SOURCE10} SELinux
%patch -P 9 -p1
%patch -P 10 -p1
%patch -P 11 -p1
%patch -P 12 -p1
%patch -P 1001 -p1
%if %{enable_fips_mode}
@ -1004,6 +1006,10 @@ fi
%{_datadir}/selinux/*/grafana.pp
%changelog
* Fri Dec 15 2023 Sam Feifer <sfeifer@redhat.com> 9.2.10-13
- Fixes coredump issue introduced by selinux
- Patches out call to panic when trying to walk "/" directory
* Thu Nov 30 2023 Sam Feifer <sfeifer@redhat.com> - 9.2.10-12
- Fix another set of AVC denials found testing only on some architectures