refpolicy: fix real path for cpio/swapoff

PATCH In review [email protected] 2 participants 4 messages Jan 28, 2014

lore

Share & tools

lore

[email protected]

author

2014-01-28 01:52 UTC #0 lore raw

cover refpolicy: fix real path for cpio/swapoff

From: Wenzong Fan <[email protected]>

The following changes since commit 8ce3b9d0d20c79e0d6bba325f6eedbd11febc101:

refpolicy: fix new symlink for policy.kern (2014-01-26 17:44:56 +0800)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib wenzong/ref-fix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/ref-fix

Wenzong Fan (2):
refpolicy: fix real path for cpio
refpolicy: fix real path for swapoff

 .../refpolicy-2.20130424/poky-fc-fstools.patch     |   19 ++++++++-------
 .../refpolicy-2.20130424/poky-fc-rpm.patch         |   25 ++++++++++++++++++++
 .../refpolicy/refpolicy_2.20130424.inc             |    1 +
 3 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch

Signature · 1 line

1.7.9.5

[email protected]

author

2014-01-28 01:52 UTC #1 lore raw

PATCH 1/2 refpolicy: fix real path for cpio

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>

---
 .../refpolicy-2.20130424/poky-fc-rpm.patch         |   25 ++++++++++++++++++++
 .../refpolicy/refpolicy_2.20130424.inc             |    1 +
 2 files changed, 26 insertions(+)
 create mode 100644 recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch

recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch new file +25 -0

new file mode 100644
index 0000000..7ba3380
@@ -0,0 +1,25 @@
+From 3ecbd842d51a8e70b3403e857a24203285d4983b Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <[email protected]>
+Date: Mon, 27 Jan 2014 01:13:06 -0500
+Subject: [PATCH] refpolicy: fix real path for cpio
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Wenzong Fan <[email protected]>
+---
+ policy/modules/contrib/rpm.fc |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/policy/modules/contrib/rpm.fc b/policy/modules/contrib/rpm.fc
+index ebe91fc..539063c 100644
+--- a/policy/modules/contrib/rpm.fc
++++ b/policy/modules/contrib/rpm.fc
+@@ -58,4 +58,5 @@ ifdef(`distro_redhat',`
+ 
+ ifdef(`enable_mls',`
+ /usr/sbin/cpio	--	gen_context(system_u:object_r:rpm_exec_t,s0)
++/bin/cpio.cpio	--	gen_context(system_u:object_r:rpm_exec_t,s0)
+ ')
+-- 
+1.7.9.5
+

recipes-security/refpolicy/refpolicy_2.20130424.inc +1 -0

index cfeeaed..cb1dec6 100644
@@ -28,6 +28,7 @@ SRC_URI += "file://poky-fc-subs_dist.patch \
             file://poky-fc-su.patch \
             file://poky-fc-sysnetwork.patch \
             file://poky-fc-udevd.patch \
+            file://poky-fc-rpm.patch \
            "
 
 # Specific policy for Poky

Signature · 1 line

1.7.9.5

[email protected]

author

2014-01-28 01:52 UTC #2 lore raw

PATCH 2/2 refpolicy: fix real path for swapoff

In reply to [email protected]

From: Wenzong Fan <[email protected]>

Signed-off-by Wenzong Fan <[email protected]>

---
 .../refpolicy-2.20130424/poky-fc-fstools.patch     |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-fstools.patch +10 -9

index 8e54921..5343893 100644
@@ -1,17 +1,17 @@
-From 852860529f24547b662d9383c0eaa821c9efa406 Mon Sep 17 00:00:00 2001
-From: Xin Ouyang <[email protected]>
-Date: Thu, 22 Aug 2013 19:18:39 +0800
-Subject: [PATCH] efpolicy: fix real path for fstools
+From 7fdfd2ef8764ddfaeb43e53a756af83d42d8ac8b Mon Sep 17 00:00:00 2001
+From: Wenzong Fan <[email protected]>
+Date: Mon, 27 Jan 2014 03:54:01 -0500
+Subject: [PATCH] refpolicy: fix real path for fstools
 
 Upstream-Status: Inappropriate [configuration]
 
-Signed-off-by: Xin Ouyang <[email protected]>
+Signed-off-by: Wenzong Fan <[email protected]>
 ---
- policy/modules/system/fstools.fc |   11 +++++++++++
- 1 file changed, 11 insertions(+)
+ policy/modules/system/fstools.fc |   12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc
-index 7a46b45..9656352 100644
+index 7a46b45..a724776 100644
 --- a/policy/modules/system/fstools.fc
 +++ b/policy/modules/system/fstools.fc
 @@ -1,6 +1,8 @@

@@ -36,7 +36,7 @@ index 7a46b45..9656352 100644
  /sbin/install-mbr	--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/jfs_.*		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/losetup.*		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
-@@ -24,21 +29,27 @@
+@@ -24,21 +29,28 @@
  /sbin/mkraid		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/mkreiserfs	--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/mkswap		--	gen_context(system_u:object_r:fsadm_exec_t,s0)

@@ -55,6 +55,7 @@ index 7a46b45..9656352 100644
  /sbin/sfdisk		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
 +/usr/sbin/sfdisk		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/swapoff		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
++/sbin/swapoff\.util-linux	--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/swapon.*		--	gen_context(system_u:object_r:fsadm_exec_t,s0)
  /sbin/tune2fs		--	gen_context(system_u:object_r:fsadm_exec_t,s0)

Signature · 1 line

1.7.9.5

Pascal Ouyang

2014-01-28 07:21 UTC #3 lore raw

In reply to [email protected]

Quoted 15 lines · 于 14-1-28 上午9:52, [email protected] 写道:

From: Wenzong Fan <[email protected]>
The following changes since commit 8ce3b9d0d20c79e0d6bba325f6eedbd11febc101:
   refpolicy: fix new symlink for policy.kern (2014-01-26 17:44:56 +0800)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib wenzong/ref-fix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/ref-fix
Wenzong Fan (2):
refpolicy: fix real path for cpio
refpolicy: fix real path for swapoff

Quoted 6 lines

  .../refpolicy-2.20130424/poky-fc-fstools.patch     |   19 ++++++++-------
  .../refpolicy-2.20130424/poky-fc-rpm.patch         |   25 ++++++++++++++++++++
  .../refpolicy/refpolicy_2.20130424.inc             |    1 +
  3 files changed, 36 insertions(+), 9 deletions(-)

create mode 100644 recipes-security/refpolicy/refpolicy-2.20130424/poky-fc-rpm.patch

Merged. Thanks. :)

- Pascal

Signature · 1 line

- Pascal