- fix #232218 character devices /dev/twa* for 3ware 9000 series RAID
controllers are not created
This commit is contained in:
Tomas Smetana
parent
64c7371fc6
commit
1666bb9f43
160
smartmontools-5.38-selinux.patch
Normal file
160
smartmontools-5.38-selinux.patch
Normal file
@ -0,0 +1,160 @@
|
|||||||
|
diff -up sm5.mine/configure.in.selinux sm5.mine/configure.in
|
||||||
|
--- sm5.mine/configure.in.selinux 2008-04-01 09:01:02.000000000 +0200
|
||||||
|
+++ sm5.mine/configure.in 2008-03-28 11:06:05.000000000 +0100
|
||||||
|
@@ -136,6 +136,16 @@ AC_ARG_ENABLE(sample,[AC_HELP_STRING([--
|
||||||
|
AC_SUBST(smartd_suffix)
|
||||||
|
AM_CONDITIONAL(SMARTD_SUFFIX, test $smartd_suffix)
|
||||||
|
|
||||||
|
+AC_ARG_WITH(selinux,[AC_HELP_STRING([--with-selinux],[Enables SELinux support])],
|
||||||
|
+ [
|
||||||
|
+ AC_CHECK_HEADERS([selinux/selinux.h], [], [echo "*** Error: Missing SELinux header files";exit 1])
|
||||||
|
+ AC_CHECK_LIB(selinux, matchpathcon, [with_selinux=yes], [echo "*** Error: Missing or incorrect SELinux library files"; exit 1],)
|
||||||
|
+ ],[])
|
||||||
|
+AC_SUBST(with_selinux)
|
||||||
|
+if test "$with_selinux" = "yes"; then
|
||||||
|
+ AC_DEFINE(WITH_SELINUX, [1], [Define to 1 if SELinux support is enabled])
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
if test "$prefix" = "NONE"; then
|
||||||
|
dnl no prefix and no mandir, so use ${prefix}/share/man as default
|
||||||
|
if test "$mandir" = '${prefix}/man'; then
|
||||||
|
@@ -151,7 +161,11 @@ dnl if OS not recognized, then use the o
|
||||||
|
case "${host}" in
|
||||||
|
*-*-linux*)
|
||||||
|
AC_SUBST([os_deps], ['os_linux.o cciss.o'])
|
||||||
|
- AC_SUBST([os_libs], ['']) ;;
|
||||||
|
+ if test "$with_selinux" = "yes"; then
|
||||||
|
+ AC_SUBST([os_libs], ['-lselinux'])
|
||||||
|
+ else
|
||||||
|
+ AC_SUBST([os_libs], [''])
|
||||||
|
+ fi;;
|
||||||
|
*-*-freebsd*|*-*-dragonfly*|*-*-kfreebsd*-gnu*)
|
||||||
|
AC_SUBST([os_deps], ['os_freebsd.o cciss.o'])
|
||||||
|
AC_SUBST([os_libs], ['-lcam']);;
|
||||||
|
diff -up sm5.mine/os_linux.cpp.selinux sm5.mine/os_linux.cpp
|
||||||
|
--- sm5.mine/os_linux.cpp.selinux 2008-04-01 09:01:14.000000000 +0200
|
||||||
|
+++ sm5.mine/os_linux.cpp 2008-04-01 12:28:04.000000000 +0200
|
||||||
|
@@ -60,6 +60,9 @@
|
||||||
|
#ifndef makedev // old versions of types.h do not include sysmacros.h
|
||||||
|
#include <sys/sysmacros.h>
|
||||||
|
#endif
|
||||||
|
+#ifdef WITH_SELINUX
|
||||||
|
+#include <selinux/selinux.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "int64.h"
|
||||||
|
#include "atacmds.h"
|
||||||
|
@@ -105,6 +108,14 @@ int setup_3ware_nodes(const char *nodena
|
||||||
|
char nodestring[NODE_STRING_LENGTH];
|
||||||
|
struct stat stat_buf;
|
||||||
|
FILE *file;
|
||||||
|
+ int retval = 0;
|
||||||
|
+#ifdef WITH_SELINUX
|
||||||
|
+ security_context_t orig_context = NULL;
|
||||||
|
+ security_context_t node_context = NULL;
|
||||||
|
+ int selinux_enabled = is_selinux_enabled();
|
||||||
|
+ int selinux_enforced = security_getenforce();
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
|
||||||
|
/* First try to open up /proc/devices */
|
||||||
|
if (!(file = fopen("/proc/devices", "r"))) {
|
||||||
|
@@ -129,18 +140,50 @@ int setup_3ware_nodes(const char *nodena
|
||||||
|
pout("No major number for /dev/%s listed in /proc/devices. Is the %s driver loaded?\n", nodename, driver_name);
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+#ifdef WITH_SELINUX
|
||||||
|
+ /* Prepare a database of contexts for files in /dev
|
||||||
|
+ * and save the current context */
|
||||||
|
+ if (selinux_enabled) {
|
||||||
|
+ if (matchpathcon_init_prefix(NULL, "/dev") < 0)
|
||||||
|
+ pout("Error initializing contexts database for /dev");
|
||||||
|
+ if (getfscreatecon(&orig_context) < 0) {
|
||||||
|
+ pout("Error retrieving original SELinux fscreate context");
|
||||||
|
+ if (selinux_enforced)
|
||||||
|
+ matchpathcon_fini();
|
||||||
|
+ return 6;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
/* Now check if nodes are correct */
|
||||||
|
for (index=0; index<16; index++) {
|
||||||
|
sprintf(nodestring, "/dev/%s%d", nodename, index);
|
||||||
|
-
|
||||||
|
+#ifdef WITH_SELINUX
|
||||||
|
+ /* Get context of the node and set it as the default */
|
||||||
|
+ if (selinux_enabled) {
|
||||||
|
+ if (matchpathcon(nodestring, S_IRUSR | S_IWUSR, &node_context) < 0) {
|
||||||
|
+ pout("Could not retreive context for %s", nodestring);
|
||||||
|
+ if (selinux_enforced) {
|
||||||
|
+ retval = 6;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if (setfscreatecon(node_context) < 0) {
|
||||||
|
+ pout ("Error setting default fscreate context");
|
||||||
|
+ if (selinux_enforced) {
|
||||||
|
+ retval = 6;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
/* Try to stat the node */
|
||||||
|
if ((stat(nodestring, &stat_buf))) {
|
||||||
|
/* Create a new node if it doesn't exist */
|
||||||
|
if (mknod(nodestring, S_IFCHR|0600, makedev(tw_major, index))) {
|
||||||
|
pout("problem creating 3ware device nodes %s", nodestring);
|
||||||
|
syserror("mknod");
|
||||||
|
- return 3;
|
||||||
|
+ retval = 3;
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -153,18 +196,41 @@ int setup_3ware_nodes(const char *nodena
|
||||||
|
if (unlink(nodestring)) {
|
||||||
|
pout("problem unlinking stale 3ware device node %s", nodestring);
|
||||||
|
syserror("unlink");
|
||||||
|
- return 4;
|
||||||
|
+ retval = 4;
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Make a new node */
|
||||||
|
if (mknod(nodestring, S_IFCHR|0600, makedev(tw_major, index))) {
|
||||||
|
pout("problem creating 3ware device nodes %s", nodestring);
|
||||||
|
syserror("mknod");
|
||||||
|
- return 5;
|
||||||
|
+ retval = 5;
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#ifdef WITH_SELINUX
|
||||||
|
+ if (selinux_enabled && node_context) {
|
||||||
|
+ freecon(node_context);
|
||||||
|
+ node_context = NULL;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
- return 0;
|
||||||
|
+
|
||||||
|
+#ifdef WITH_SELINUX
|
||||||
|
+ if (selinux_enabled) {
|
||||||
|
+ if(setfscreatecon(orig_context) < 0) {
|
||||||
|
+ pout("Error re-setting original fscreate context");
|
||||||
|
+ if (selinux_enforced)
|
||||||
|
+ retval = 6;
|
||||||
|
+ }
|
||||||
|
+ if(orig_context)
|
||||||
|
+ freecon(orig_context);
|
||||||
|
+ if(node_context)
|
||||||
|
+ freecon(node_context);
|
||||||
|
+ matchpathcon_fini();
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+ return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
static char prev_scsi_dev[128];
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Summary: Tools for monitoring SMART capable hard disks
|
Summary: Tools for monitoring SMART capable hard disks
|
||||||
Name: smartmontools
|
Name: smartmontools
|
||||||
Version: 5.38
|
Version: 5.38
|
||||||
Release: 2%{?dist}
|
Release: 4%{?dist}
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -12,6 +12,8 @@ Source2: smartd-conf.py
|
|||||||
Source3: smartmontools.sysconf
|
Source3: smartmontools.sysconf
|
||||||
Patch1: smartmontools-5.38-cloexec.patch
|
Patch1: smartmontools-5.38-cloexec.patch
|
||||||
Patch2: smartmontools-5.37-addrinfo.patch
|
Patch2: smartmontools-5.37-addrinfo.patch
|
||||||
|
Patch3: smartmontools-5.38-perc.patch
|
||||||
|
Patch4: smartmontools-5.38-selinux.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
PreReq: /sbin/chkconfig /sbin/service
|
PreReq: /sbin/chkconfig /sbin/service
|
||||||
@ -41,10 +43,12 @@ the /etc/smartd.conf configuration file.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1 -b .cloexec
|
%patch1 -p1 -b .cloexec
|
||||||
%patch2 -p1 -b .addrinfo
|
%patch2 -p1 -b .addrinfo
|
||||||
|
%patch3 -p1 -b .perc
|
||||||
|
%patch4 -p1 -b .selinux
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
%configure
|
%configure --with-selinux
|
||||||
make CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-fpie -Wl,-z,relro,-z,now"
|
make CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-fpie -Wl,-z,relro,-z,now"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -105,6 +109,13 @@ exit 0
|
|||||||
%exclude %{_sbindir}/smartd-conf.py[co]
|
%exclude %{_sbindir}/smartd-conf.py[co]
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 05 2008 Tomas Smetana <tsmetana@redhat.com> - 1:5.38-4
|
||||||
|
- fix #232218 character devices /dev/twa* for 3ware 9000 series RAID
|
||||||
|
controllers are not created
|
||||||
|
|
||||||
|
* Thu Mar 27 2008 Tomas Smetana <tsmetana@redhat.com> - 1:5.38-3
|
||||||
|
- don't attempt to query DELL PERC controllers -- they'd go offline
|
||||||
|
|
||||||
* Tue Mar 18 2008 Tomas Smetana <tsmetana@redhat.com> - 1:5.38-2
|
* Tue Mar 18 2008 Tomas Smetana <tsmetana@redhat.com> - 1:5.38-2
|
||||||
- fix FD_CLOEXEC on SCSI device file descriptors not being set
|
- fix FD_CLOEXEC on SCSI device file descriptors not being set
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user