From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from jazzhorn.ncsc.mil (mummy.ncsc.mil [144.51.88.129]) by tarius.tycho.ncsc.mil (8.13.1/8.13.1) with ESMTP id l186rHWE021134 for ; Thu, 8 Feb 2007 01:53:17 -0500 Received: from msp1.hitachi-sk.co.jp (jazzhorn.ncsc.mil [144.51.5.9]) by jazzhorn.ncsc.mil (8.12.10/8.12.10) with ESMTP id l186sOX2023167 for ; Thu, 8 Feb 2007 06:54:25 GMT Received: from vs1.hitachi-sk.co.jp ([133.108.252.215]) by msp1.hitachi-sk.co.jp (unknown) with ESMTP id l186sNov005474 for ; Thu, 8 Feb 2007 15:54:23 +0900 Date: Thu, 8 Feb 2007 15:54:32 +0900 From: Yuichi Nakamura To: busybox@busybox.net, selinux@tycho.nsa.gov Cc: russell@coker.com.au, rob@landley.net, busybox@kaigai.gr.jp, vda.linux@googlemail.com, ynakam@hitachisoft.jp Subject: [PATCH 2/6] busybox -- SELinux option support for coreutils Message-Id: <20070208155432.e8234d84.ynakam@hitachisoft.jp> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Multipart=_Thu__8_Feb_2007_15_54_32_+0900_K=vbfx.NI+aMJFWU" Sender: owner-selinux@tycho.nsa.gov List-Id: selinux@tycho.nsa.gov This is a multi-part message in MIME format. --Multipart=_Thu__8_Feb_2007_15_54_32_+0900_K=vbfx.NI+aMJFWU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit [2/6] busybox-coreutils-02-copy.patch - cp: -Z,-c option support. -c option: security context is preserved during file copy. -Z option: security context can be set during file copy. - mv In SELinux, it is recommended to preserve security context when file is moved. By this patch, file context is preserved during file move. - install When file is copied by install, security context of installed file becomes different from value configured in file_contexts file. By this patch, security context is set according to file_contexts file. Signed-off-by: Yuichi Nakamura --Multipart=_Thu__8_Feb_2007_15_54_32_+0900_K=vbfx.NI+aMJFWU Content-Type: application/octet-stream; name="busybox-coreutils-copy-02.patch" Content-Disposition: attachment; filename="busybox-coreutils-copy-02.patch" Content-Transfer-Encoding: base64 SW5kZXg6IGluY2x1ZGUvbGliYmIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBpbmNsdWRlL2xpYmJiLmgJKHJl dmlzaW9uIDE3ODAzKQorKysgaW5jbHVkZS9saWJiYi5oCSh3b3JraW5nIGNvcHkpCkBAIC03NDMs OSArNzQzLDE1IEBACiAJRklMRVVUSUxTX0lOVEVSQUNUSVZFID0gMHgxMCwKIAlGSUxFVVRJTFNf TUFLRV9IQVJETElOSyA9IDB4MjAsCiAJRklMRVVUSUxTX01BS0VfU09GVExJTksgPSAweDQwLAor I2lmIEVOQUJMRV9TRUxJTlVYCisJRklMRVVUSUxTX1BSRVNFUlZFX1NFQ1VSSVRZX0NPTlRFWFQg PSAweDgwLAorCUZJTEVVVElMU19TRVRfU0VDVVJJVFlfQ09OVEVYVCA9IDB4MTAwCisjZW5kaWYK KwogfTsKLSNkZWZpbmUgRklMRVVUSUxTX0NQX09QVFNUUiAicGRSZmlscyIKIAorI2RlZmluZSBG SUxFVVRJTFNfQ1BfT1BUU1RSICJwZFJmaWxzIiBVU0VfU0VMSU5VWCgiY1o6IikKKwogZXh0ZXJu IGNvbnN0IGNoYXIgKmFwcGxldF9uYW1lOwogZXh0ZXJuIGNvbnN0IGNoYXIgQkJfQkFOTkVSW107 CiAKSW5kZXg6IGNvcmV1dGlscy9jcC5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGNvcmV1dGlscy9jcC5jCShy ZXZpc2lvbiAxNzgwMykKKysrIGNvcmV1dGlscy9jcC5jCSh3b3JraW5nIGNvcHkpCkBAIC0zLDYg KzMsNyBAQAogICogTWluaSBjcCBpbXBsZW1lbnRhdGlvbiBmb3IgYnVzeWJveAogICoKICAqIENv cHlyaWdodCAoQykgMjAwMCBieSBNYXR0IEtyYWFpIDxrcmFhaUBhbHVtbmkuY2FybmVnaWVtZWxs b24uZWR1PgorICogU0VMaW51eCBzdXBwb3J0IGJ5IFl1aWNoaSBOYWthbXVyYSA8eW5ha2FtQGhp dGFjaGlzb2Z0LmpwPgogICoKICAqIExpY2Vuc2VkIHVuZGVyIEdQTCB2MiBvciBsYXRlciwgc2Vl IGZpbGUgTElDRU5TRSBpbiB0aGlzIHRhcmJhbGwgZm9yIGRldGFpbHMuCiAgKi8KQEAgLTI4LDYg KzI5LDkgQEAKIAlpbnQgZF9mbGFnczsKIAlpbnQgZmxhZ3M7CiAJaW50IHN0YXR1cyA9IDA7Cisj aWYgRU5BQkxFX1NFTElOVVgKKyAJY2hhciAqY29udGV4dF9zdHIgPSBOVUxMOworI2VuZGlmCiAJ ZW51bSB7CiAJCU9QVF9hID0gMSA8PCAoc2l6ZW9mKEZJTEVVVElMU19DUF9PUFRTVFIpLTEpLAog CQlPUFRfciA9IDEgPDwgKHNpemVvZihGSUxFVVRJTFNfQ1BfT1BUU1RSKSksCkBAIC00MCw4ICs0 NCw4IEBACiAJLy8gLVAgYW5kIC1kIGFyZSB0aGUgc2FtZSAoLVAgaXMgUE9TSVgsIC1kIGlzIEdO VSkKIAkvLyAtciBhbmQgLVIgYXJlIHRoZSBzYW1lCiAJLy8gLWEgPSAtcGRSCi0Jb3B0X2NvbXBs ZW1lbnRhcnkgPSAiPzpsLS1zOnMtLWw6UGQ6clI6YXBkUiI7Ci0JZmxhZ3MgPSBnZXRvcHQzMihh cmdjLCBhcmd2LCBGSUxFVVRJTFNfQ1BfT1BUU1RSICJhclBITCIpOworCW9wdF9jb21wbGVtZW50 YXJ5ID0gIj86bC0tczpzLS1sOlBkOnJSOmFwZFIiIFVTRV9TRUxJTlVYKCI6Yy0tWjpaLS1jIik7 CisJZmxhZ3MgPSBnZXRvcHQzMihhcmdjLCBhcmd2LCBGSUxFVVRJTFNfQ1BfT1BUU1RSICJhclBI TCIgVVNFX1NFTElOVVgoLCZjb250ZXh0X3N0cikpOwogCS8qIERlZmF1bHQgYmVoYXZpb3Igb2Yg Y3AgaXMgdG8gZGVyZWZlcmVuY2UsIHNvIHdlIGRvbid0IGhhdmUgdG8gZG8KIAkgKiBhbnl0aGlu ZyBzcGVjaWFsIHdoZW4gd2UgYXJlIGdpdmVuIC1MLgogCSAqIFRoZSBiZWhhdmlvciBvZiAtSCBp cyAqYWxtb3N0KiBsaWtlIC1MLCBidXQgbm90IHF1aXRlLCBzbyBsZXQncwpAQCAtNTAsNiArNTQs MTkgQEAKIAlpZiAoZmxhZ3MgJiBPUFRfSCkgLi4uIC8vIGRlcmVmIGNvbW1hbmQtbGluZSBwYXJh bXMgb25seQogCSovCiAKKyNpZiBFTkFCTEVfU0VMSU5VWCAKKwlpZiAoZmxhZ3MgJiBGSUxFVVRJ TFNfU0VUX1NFQ1VSSVRZX0NPTlRFWFQpIHsKKwkJaWYoaXNfc2VsaW51eF9lbmFibGVkKCkgPT0g MCkgeworCQkJZnByaW50Ziggc3RkZXJyLCAiV2FybmluZzogIGlnbm9yaW5nIC0tY29udGV4dCAo LVopLiAiCisJCQkJCSAiSXQgcmVxdWlyZXMgYSBTRUxpbnV4IGVuYWJsZWQga2VybmVsLlxuIiAp OworCQl9ZWxzZXsKKwkJCWlmICggc2V0ZnNjcmVhdGVjb24oY29udGV4dF9zdHIpIDwgMCApIHsK KwkJCQliYl9lcnJvcl9tc2dfYW5kX2RpZSgiY2Fubm90IHNldCBkZWZhdWx0IHNlY3VyaXR5IGNv bnRleHQgJXNcbiIsIGNvbnRleHRfc3RyKTsKKwkJCX0KKwkJfQorCX0KKyNlbmRpZgorCiAJZmxh Z3MgXj0gRklMRVVUSUxTX0RFUkVGRVJFTkNFOwkJLyogVGhlIHNlbnNlIG9mIHRoaXMgZmxhZyB3 YXMgcmV2ZXJzZWQuICovCiAKIAlpZiAob3B0aW5kICsgMiA+IGFyZ2MpIHsKSW5kZXg6IGNvcmV1 dGlscy9tdi5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIGNvcmV1dGlscy9tdi5jCShyZXZpc2lvbiAxNzgwMykK KysrIGNvcmV1dGlscy9tdi5jCSh3b3JraW5nIGNvcHkpCkBAIC0zLDYgKzMsNyBAQAogICogTWlu aSBtdiBpbXBsZW1lbnRhdGlvbiBmb3IgYnVzeWJveAogICoKICAqIENvcHlyaWdodCAoQykgMjAw MCBieSBNYXR0IEtyYWFpIDxrcmFhaUBhbHVtbmkuY2FybmVnaWVtZWxsb24uZWR1PgorICogU0VM aW51eCBzdXBwb3J0IGJ5IFl1aWNoaSBOYWthbXVyYSA8eW5ha2FtQGhpdGFjaGlzb2Z0LmpwPgog ICoKICAqIExpY2Vuc2VkIHVuZGVyIEdQTHYyIG9yIGxhdGVyLCBzZWUgZmlsZSBMSUNFTlNFIGlu IHRoaXMgdGFyYmFsbCBmb3IgZGV0YWlscy4KICAqLwpAQCAtNDQsNiArNDUsNyBAQAogCXVuc2ln bmVkIGxvbmcgZmxhZ3M7CiAJaW50IGRlc3RfZXhpc3RzOwogCWludCBzdGF0dXMgPSAwOworCWlu dCBjb3B5X2ZsYWcgPSAwOwogCiAjaWYgRU5BQkxFX0ZFQVRVUkVfTVZfTE9OR19PUFRJT05TCiAJ YXBwbGV0X2xvbmdfb3B0aW9ucyA9IG12X2xvbmdfb3B0aW9uczsKQEAgLTExMyw4ICsxMTUsMTEg QEAKIAkJCQkJCWdvdG8gUkVUXzE7CiAJCQkJCX0KIAkJCQl9Ci0JCQkJaWYgKChjb3B5X2ZpbGUo KmFyZ3YsIGRlc3QsCi0JCQkJCUZJTEVVVElMU19SRUNVUiB8IEZJTEVVVElMU19QUkVTRVJWRV9T VEFUVVMpID49IDApICYmCisJCQkJY29weV9mbGFnID0gRklMRVVUSUxTX1JFQ1VSIHwgRklMRVVU SUxTX1BSRVNFUlZFX1NUQVRVUzsKKyNpZiBFTkFCTEVfU0VMSU5VWAorCQkJCWNvcHlfZmxhZyB8 PSBGSUxFVVRJTFNfUFJFU0VSVkVfU0VDVVJJVFlfQ09OVEVYVDsKKyNlbmRpZgkJCQkKKwkJCQlp ZiAoKGNvcHlfZmlsZSgqYXJndiwgZGVzdCwJY29weV9mbGFnKSA+PSAwKSAmJgogCQkJCQkocmVt b3ZlX2ZpbGUoKmFyZ3YsIEZJTEVVVElMU19SRUNVUiB8IEZJTEVVVElMU19GT1JDRSkgPj0gMCkp IHsKIAkJCQkJZ290byBSRVRfMDsKIAkJCQl9CkluZGV4OiBjb3JldXRpbHMvaW5zdGFsbC5jCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGNvcmV1dGlscy9pbnN0YWxsLmMJKHJldmlzaW9uIDE3ODAzKQorKysgY29y ZXV0aWxzL2luc3RhbGwuYwkod29ya2luZyBjb3B5KQpAQCAtMjUsNiArMjUsNDEgQEAKIH07CiAj ZW5kaWYKIAorCisjaWYgRU5BQkxFX1NFTElOVVgKK3N0YXRpYyBpbnQgdXNlX2RlZmF1bHRfc2Vs aW51eF9jb250ZXh0ID0gMTsKKworc3RhdGljIHZvaWQgc2V0ZGVmYXVsdGZpbGVjb24oY29uc3Qg Y2hhciAqcGF0aCkgeworCXN0cnVjdCBzdGF0IHM7CisJc2VjdXJpdHlfY29udGV4dF90IHNjb250 ZXh0ID0gTlVMTDsKKworCWlmICghaXNfc2VsaW51eF9lbmFibGVkKCkpeworCQlyZXR1cm47CisJ fQkKKwlpZiAobHN0YXQocGF0aCwgJnMpICE9IDApeworCQlyZXR1cm47CisJfQorCisJaWYgKG1h dGNocGF0aGNvbihwYXRoLCBzLnN0X21vZGUsICZzY29udGV4dCkgPCAwKXsKKwkJcmV0dXJuOwor CX0KKwlpZiAoc3RyY21wKHNjb250ZXh0LCAiPDxub25lPj4iKSA9PSAwKXsKKwkJZnJlZWNvbihz Y29udGV4dCk7CisJCXJldHVybjsKKwl9CisKKwlpZiAobHNldGZpbGVjb24ocGF0aCwgc2NvbnRl eHQpIDwgMCkgeworCQlpZiAoZXJybm8gIT0gRU5PVFNVUCkgeworCQkJYmJfcGVycm9yX21zZygi d2FybmluZzogZmFpbGVkIHRvIGNoYW5nZSBjb250ZXh0IG9mICVzIHRvICVzIiwgcGF0aCwgc2Nv bnRleHQpOworCQl9CisJfQorCisJZnJlZWNvbihzY29udGV4dCk7CisJcmV0dXJuOworfQorCisj ZW5kaWYKKwogaW50IGluc3RhbGxfbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpOwogaW50IGlu c3RhbGxfbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiB7CkBAIC0xMTcsNyArMTUyLDEwIEBA CiAJCQliYl9wZXJyb3JfbXNnKCJjYW5ub3QgY2hhbmdlIHBlcm1pc3Npb25zIG9mICVzIiwgZGVz dCk7CiAJCQlyZXQgPSBFWElUX0ZBSUxVUkU7CiAJCX0KLQorI2lmIEVOQUJMRV9TRUxJTlVYCisJ CWlmICh1c2VfZGVmYXVsdF9zZWxpbnV4X2NvbnRleHQpCisJCQlzZXRkZWZhdWx0ZmlsZWNvbihk ZXN0KTsKKyNlbmRpZgogCQkvKiBTZXQgdGhlIHVzZXIgYW5kIGdyb3VwIGlkICovCiAJCWlmICgo ZmxhZ3MgJiAoT1BUX09XTkVSfE9QVF9HUk9VUCkpCiAJCSAmJiBsY2hvd24oZGVzdCwgdWlkLCBn aWQpID09IC0xCkluZGV4OiBsaWJiYi9jb3B5X2ZpbGUuYwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBsaWJiYi9j b3B5X2ZpbGUuYwkocmV2aXNpb24gMTc4MDMpCisrKyBsaWJiYi9jb3B5X2ZpbGUuYwkod29ya2lu ZyBjb3B5KQpAQCAtMyw2ICszLDcgQEAKICAqIE1pbmkgY29weV9maWxlIGltcGxlbWVudGF0aW9u IGZvciBidXN5Ym94CiAgKgogICogQ29weXJpZ2h0IChDKSAyMDAxIGJ5IE1hdHQgS3JhYWkgPGty YWFpQGFsdW1uaS5jYXJuZWdpZW1lbGxvbi5lZHU+CisgKiBTRUxpbnV4IHN1cHBvcnQgYnkgWXVp Y2hpIE5ha2FtdXJhIDx5bmFrYW1AaGl0YWNoaXNvZnQuanA+CiAgKgogICogTGljZW5zZWQgdW5k ZXIgR1BMdjIgb3IgbGF0ZXIsIHNlZSBmaWxlIExJQ0VOU0UgaW4gdGhpcyB0YXJiYWxsIGZvciBk ZXRhaWxzLgogICoKQEAgLTYyLDYgKzYzLDI2IEBACiAJCWRlc3RfZXhpc3RzID0gMTsKIAl9CiAK KyNpZiBFTkFCTEVfU0VMSU5VWAorCWlmICgoZmxhZ3MgJiBGSUxFVVRJTFNfUFJFU0VSVkVfU0VD VVJJVFlfQ09OVEVYVCkgJiYgaXNfc2VsaW51eF9lbmFibGVkKCkgPiAwKXsKKwkJc2VjdXJpdHlf Y29udGV4dF90IGNvbjsKKwkJaWYgKGxnZXRmaWxlY29uIChzb3VyY2UsICZjb24pID49IDApewor CQkJaWYgKHNldGZzY3JlYXRlY29uKGNvbikgPCAwKSB7CisJCQkJYmJfcGVycm9yX21zZyAoImNh bm5vdCBzZXQgc2V0ZnNjcmVhdGVjb24gJXMiLCBjb24pOworCQkJCWZyZWVjb24oY29uKTsKKwkJ CQlyZXR1cm4gLTE7CisJCQl9CQorCQl9ZWxzZXsKKwkJCWlmKCBlcnJubyA9PSBFTk9UU1VQIHx8 IGVycm5vID09IEVOT0RBVEEgKSB7CisJCQkJc2V0ZnNjcmVhdGVjb24oTlVMTCk7CisJCQl9IGVs c2UgeworCQkJCWJiX3BlcnJvcl9tc2cgKCJjYW5ub3QgIGxnZXRmaWxlY29uICVzIiwgc291cmNl KTsKKwkJCQlyZXR1cm4gLTE7CisJCQl9CisJCX0KKwl9CisjZW5kaWYKKwogCWlmIChTX0lTRElS KHNvdXJjZV9zdGF0LnN0X21vZGUpKSB7CiAJCURJUiAqZHA7CiAJCXN0cnVjdCBkaXJlbnQgKmQ7 CkBAIC0yMDIsOCArMjIzLDI3IEBACiAJCQkJY2xvc2Uoc3JjX2ZkKTsKIAkJCQlyZXR1cm4gLTE7 CiAJCQl9CisJCX0JCQkJCisKKyNpZiBFTkFCTEVfU0VMSU5VWAorCQlpZiAoICgoZmxhZ3MgJiBG SUxFVVRJTFNfUFJFU0VSVkVfU0VDVVJJVFlfQ09OVEVYVCkKKwkJCSAgfHwoZmxhZ3MgJiBGSUxF VVRJTFNfU0VUX1NFQ1VSSVRZX0NPTlRFWFQpKQorCQkJICYmIGlzX3NlbGludXhfZW5hYmxlZCgp ID4gMCApeworCQkJc2VjdXJpdHlfY29udGV4dF90IGNvbjsgIAorCQkJaWYoZ2V0ZnNjcmVhdGVj b24oJmNvbikgPT0gLTEpeworCQkJCWJiX3BlcnJvcl9tc2cgKCJjYW5ub3QgZ2V0ZnNjcmVhdGVj b24iKTsKKwkJCQlyZXR1cm4gLTE7CisJCQl9CQkJCQorCQkJaWYgKGNvbil7CisJCQkJaWYoc2V0 ZmlsZWNvbihkZXN0LCBjb24pID09IC0xKXsKKwkJCQkJYmJfcGVycm9yX21zZyAoImNhbm5vdCBz ZXRmaWxlY29uOiVzLCVzIixkZXN0LGNvbik7CisJCQkJCWZyZWVjb24oY29uKTsKKwkJCQkJcmV0 dXJuIC0xOworCQkJCX0KKwkJCQlmcmVlY29uKGNvbik7CisJCQl9CiAJCX0KLQorI2VuZGlmCiAJ CWlmIChiYl9jb3B5ZmRfZW9mKHNyY19mZCwgZHN0X2ZkKSA9PSAtMSkKIAkJCXN0YXR1cyA9IC0x OwogCQlpZiAoY2xvc2UoZHN0X2ZkKSA8IDApIHsK --Multipart=_Thu__8_Feb_2007_15_54_32_+0900_K=vbfx.NI+aMJFWU-- -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with the words "unsubscribe selinux" without quotes as the message.