From mboxrd@z Thu Jan 1 00:00:00 1970 Subject: Re: secon (Was: Policycoreutils patch) From: James Antill To: Stephen Smalley Cc: SE Linux In-Reply-To: <1148388875.24463.152.camel@moss-spartans.epoch.ncsc.mil> References: <1147121092.3469.24.camel@code.and.org> <1148330873.24463.139.camel@moss-spartans.epoch.ncsc.mil> <1148332107.29408.2.camel@code.and.org> <1148388875.24463.152.camel@moss-spartans.epoch.ncsc.mil> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-m/GdlZaJ4WoWKO5LfPIE" Date: Thu, 25 May 2006 17:25:16 -0400 Message-Id: <1148592316.8828.29.camel@code.and.org> Mime-Version: 1.0 Sender: owner-selinux@tycho.nsa.gov List-Id: selinux@tycho.nsa.gov --=-m/GdlZaJ4WoWKO5LfPIE Content-Type: multipart/mixed; boundary="=-9RwLwzZg4tu2sYU1K+Wq" --=-9RwLwzZg4tu2sYU1K+Wq Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Tue, 2006-05-23 at 08:54 -0400, Stephen Smalley wrote: > On Mon, 2006-05-22 at 17:08 -0400, James Antill wrote: > > This is due to context_new(), can I fix this inside that function (Ie. > > don't fail out when the passed value =3D=3D "")? >=20 > Seems like the caller should handle it instead. "" isn't a valid > context, after all. Fair enough. > BTW, working off the sourceforge selinux subversion tree is preferred, > svn co https://svn.sourceforge.net/svnroot/selinux/trunk selinux-usr Ok, I can do that :). > Note that we update the ChangeLog and VERSION files ourselves upon > merging patches, no need to touch those. Ok, here's the latest changes for secon. It's the above fixes and man pages changes with sensitivity/clearance naming changes. Also a couple of typos. I've also re-included the policycoreutils change for setfiles, against the selinux svn tree. --=20 James Antill --=-9RwLwzZg4tu2sYU1K+Wq Content-Disposition: inline; filename=selinux-secon-con_new+clearance.patch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=selinux-secon-con_new+clearance.patch; charset=UTF-8 SW5kZXg6IHBvbGljeWNvcmV1dGlscy9zZWNvbi9zZWNvbi4xDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gcG9s aWN5Y29yZXV0aWxzL3NlY29uL3NlY29uLjEJKHJldmlzaW9uIDE5KQ0KKysrIHBvbGljeWNvcmV1 dGlscy9zZWNvbi9zZWNvbi4xCSh3b3JraW5nIGNvcHkpDQpAQCAtMyw3ICszLDcgQEANCiBzZWNv biBcLSBTZWUgYSBjb250ZXh0LCBmcm9tIGEgZmlsZSwgcHJvZ3JhbSBvciB1c2VyIGlucHV0Lg0K IC5TSCBTWU5PUFNJUw0KIC5CIHNlY29uDQotW1xmQi1oVnVydGxtUFJmTHBcZlJdDQorW1xmQi1o VnVydHNjbVBSZkxwXGZSXQ0KIFtcZklDT05URVhUXGZSXQ0KIC5icg0KIFtcZkItLWZpbGVcZlJd DQpAQCAtMzksMTEgKzM5LDE0IEBADQogXGZCXC10XGZSLCBcZkJcLVwtdHlwZVxmUg0KIHNob3cg dGhlIHR5cGUgb2YgdGhlIHNlY3VyaXR5IGNvbnRleHQNCiAuVFANCi1cZkJcLWxcZlIsIFxmQlwt XC1sZXZlbFxmUg0KK1xmQlwtc1xmUiwgXGZCXC1cLXNlbnNpdGl2aXR5XGZSDQogc2hvdyB0aGUg c2Vuc2l0aXZpdHkgbGV2ZWwgb2YgdGhlIHNlY3VyaXR5IGNvbnRleHQNCiAuVFANCitcZkJcLWNc ZlIsIFxmQlwtXC1jbGVhcmFuY2VcZlINCitzaG93IHRoZSBjbGVhcmFuY2UgbGV2ZWwgb2YgdGhl IHNlY3VyaXR5IGNvbnRleHQNCisuVFANCiBcZkJcLW1cZlIsIFxmQlwtXC1tbHMtcmFuZ2VcZlIN Ci1zaG93IHRoZSBzZW5zaXRpdml0eSBsZXZlbCBhbmQgY2xlYXJhbmNlIG9mIHRoZSBzZWN1cml0 eSBjb250ZXh0DQorc2hvdyB0aGUgc2Vuc2l0aXZpdHkgbGV2ZWwgYW5kIGNsZWFyYW5jZSwgYXMg YSByYW5nZSwgb2YgdGhlIHNlY3VyaXR5IGNvbnRleHQNCiAuVFANCiBcZkJcLVJcZlIsIFxmQlwt XC1yYXdcZlINCiBvdXRwdXRzICB0aGUgc2Vuc2l0aXZpdHkgbGV2ZWwgYW5kIGNsZWFyYW5jZSBp biBhbiB1bnRyYW5zbGF0ZWQgZm9ybWF0Lg0KSW5kZXg6IHBvbGljeWNvcmV1dGlscy9zZWNvbi9z ZWNvbi5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gcG9saWN5Y29yZXV0aWxzL3NlY29uL3NlY29uLmMJKHJl dmlzaW9uIDE5KQ0KKysrIHBvbGljeWNvcmV1dGlscy9zZWNvbi9zZWNvbi5jCSh3b3JraW5nIGNv cHkpDQpAQCAtMTksOCArMTksOCBAQA0KICNkZWZpbmUgRkFMU0UgMA0KIA0KICNkZWZpbmUgU0VD T05fQ09ORl9QUk9HX05BTUUgInNlY29uIiAvKiBkZWZhdWx0IHByb2dyYW0gbmFtZSAqLw0KLSNk ZWZpbmUgU0VDT05fT1BUU19TTSAiaFZ1cnRsbVBSZkxwIiAgICAvKiBzbWFsbCBvcHRpb25zIGF2 YWlsYWJsZSwgcHJpbnRpbmcgKi8NCi0jZGVmaW5lIFNFQ09OX09QVFNfR08gImhWdXJ0bG1QUmY6 TDpwOiIgLyogc21hbGwgb3B0aW9ucyBhdmFpbGFibGUsIGdldG9wdCAqLw0KKyNkZWZpbmUgU0VD T05fT1BUU19TTSAiaFZ1cnRzY21QUmZMcCIgICAgIC8qIHNtYWxsIG9wdGlvbnMgYXZhaWxhYmxl LCBwcmludCAqLw0KKyNkZWZpbmUgU0VDT05fT1BUU19HTyAiaFZ1cnRsc2NtUFJmOkw6cDoiIC8q IHNtYWxsIG9wdGlvbnMgYXZhaWxhYmxlLCBnZXRvcHQgKi8NCiANCiAjZGVmaW5lIE9QVFNfRlJP TV9BUkcgICAgICAwDQogI2RlZmluZSBPUFRTX0ZST01fRklMRSAgICAgMQ0KQEAgLTM1LDE3ICsz NSwxOCBAQA0KIA0KIHN0cnVjdCANCiB7DQotIHVuc2lnbmVkIGludCBkaXNwX3VzZXIgIDogIDE7 DQotIHVuc2lnbmVkIGludCBkaXNwX3JvbGUgIDogIDE7DQotIHVuc2lnbmVkIGludCBkaXNwX3R5 cGUgIDogIDE7DQotIHVuc2lnbmVkIGludCBkaXNwX2xldmVsIDogIDE7DQotIHVuc2lnbmVkIGlu dCBkaXNwX21sc3IgIDogIDE7DQorIHVuc2lnbmVkIGludCBkaXNwX3VzZXIgOiAgMTsNCisgdW5z aWduZWQgaW50IGRpc3Bfcm9sZSA6ICAxOw0KKyB1bnNpZ25lZCBpbnQgZGlzcF90eXBlIDogIDE7 DQorIHVuc2lnbmVkIGludCBkaXNwX3NlbiAgOiAgMTsNCisgdW5zaWduZWQgaW50IGRpc3BfY2xy ICA6ICAxOw0KKyB1bnNpZ25lZCBpbnQgZGlzcF9tbHNyIDogIDE7DQogIA0KLSB1bnNpZ25lZCBp bnQgZGlzcF9yYXcgICA6ICAxOw0KKyB1bnNpZ25lZCBpbnQgZGlzcF9yYXcgIDogIDE7DQogDQog IHVuc2lnbmVkIGludCBkaXNwX3Byb21wdCA6IDE7IC8qIG5vIHJldHVybiwgdXNlIDogdG8gc2Vw ICovDQogDQotIHVuc2lnbmVkIGludCBmcm9tX3R5cGUgIDogIDk7IC8qIDE2IGJpdHMgKi8NCisg dW5zaWduZWQgaW50IGZyb21fdHlwZSAgOiAgODsgLyogMTYgYml0cywgdXNlcyA0IGJpdHMgKi8N CiANCiAgdW5pb24gDQogIHsNCkBAIC01NCw3ICs1NSw3IEBADQogICBjb25zdCBjaGFyICpsaW5r Ow0KICAgY29uc3QgY2hhciAqYXJnOw0KICB9IGY7DQotfSBvcHRzWzFdID0ge3tGQUxTRSwgRkFM U0UsIEZBTFNFLCBGQUxTRSwgRkFMU0UsDQorfSBvcHRzWzFdID0ge3tGQUxTRSwgRkFMU0UsIEZB TFNFLCBGQUxTRSwgRkFMU0UsIEZBTFNFLA0KICAgICAgICAgICAgICAgRkFMU0UsIEZBTFNFLCBP UFRTX0ZST01fQVJHLCB7MH19fTsNCiANCiANCkBAIC02MiwxNiArNjMsMTcgQEANCiB7DQogICBm cHJpbnRmKGV4aXRfY29kZSA/IHN0ZGVyciA6IHN0ZG91dCwNCiAgICAgICAgICAgIiAgVXNhZ2U6 ICVzIFstJXNdIFsgY29udGV4dCB8IC0gXVxuIg0KLSIgICAgICAgICAgLS1oZWxwICAgICAgLWgg ICAgICAgU2hvdyB0aGlzIG1lc3NhZ2UuXG4iDQotIiAgICAgICAgICAtLXZlcnNpb24gICAtViAg ICAgICBTaG93IHRoZSB2ZXJzaW9uLlxuIg0KLSIgICAgICAgICAgLS1wcm9tcHQgICAgLVAgICAg ICAgT3V0cHV0IGluIGEgZm9ybWF0IGdvb2QgZm9yIGEgcHJvbXB0LlxuIg0KLSIgICAgICAgICAg LS11c2VyICAgICAgLXUgICAgICAgU2hvdyB0aGUgdXNlciBvZiB0aGUgY29udGV4dC5cbiINCi0i ICAgICAgICAgIC0tcm9sZSAgICAgIC1yICAgICAgIFNob3cgdGhlIHJvbGUgb2YgdGhlIGNvbnRl eHQuXG4iDQotIiAgICAgICAgICAtLXR5cGUgICAgICAtdCAgICAgICBTaG93IHRoZSB0eXBlIG9m IHRoZSBjb250ZXh0LlxuIg0KLSIgICAgICAgICAgLS1sZXZlbCAgICAgLWwgICAgICAgU2hvdyB0 aGUgc2Vuc2l0aXZpdHkgbGV2ZWwgb2YgdGhlIGNvbnRleHQuXG4iDQotIiAgICAgICAgICAtLW1s cy1yYW5nZSAtbSAgICAgICBTaG93IHRoZSBzZW5zaXRpdml0eSBsZXZlbCBhbmQgY2xlYXJhbmNl IG9mIFxuIg0KKyIgICAgICAgICAgLS1oZWxwICAgICAgICAtaCAgICAgU2hvdyB0aGlzIG1lc3Nh Z2UuXG4iDQorIiAgICAgICAgICAtLXZlcnNpb24gICAgIC1WICAgICBTaG93IHRoZSB2ZXJzaW9u LlxuIg0KKyIgICAgICAgICAgLS1wcm9tcHQgICAgICAtUCAgICAgT3V0cHV0IGluIGEgZm9ybWF0 IGdvb2QgZm9yIGEgcHJvbXB0LlxuIg0KKyIgICAgICAgICAgLS11c2VyICAgICAgICAtdSAgICAg U2hvdyB0aGUgdXNlciBvZiB0aGUgY29udGV4dC5cbiINCisiICAgICAgICAgIC0tcm9sZSAgICAg ICAgLXIgICAgIFNob3cgdGhlIHJvbGUgb2YgdGhlIGNvbnRleHQuXG4iDQorIiAgICAgICAgICAt LXR5cGUgICAgICAgIC10ICAgICBTaG93IHRoZSB0eXBlIG9mIHRoZSBjb250ZXh0LlxuIg0KKyIg ICAgICAgICAgLS1zZW5zaXRpdml0eSAtcyAgICAgU2hvdyB0aGUgc2Vuc2l0aXZpdHkgbGV2ZWwg b2YgdGhlIGNvbnRleHQuXG4iDQorIiAgICAgICAgICAtLWNsZWFyYW5jZSAgIC1jICAgICBTaG93 IHRoZSBjbGVhcmFuY2UgbGV2ZWwgb2YgdGhlIGNvbnRleHQuXG4iDQorIiAgICAgICAgICAtLW1s cy1yYW5nZSAgIC1tICAgICBTaG93IHRoZSBzZW5zaXRpdml0eSB0byBjbGVhcmFuY2UgcmFuZ2Ug b2YgXG4iDQogIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGUgY29udGV4dC5cbiIN Ci0iICAgICAgICAgIC0tcmF3ICAgICAgIC1SICAgICAgIFNob3cgdGhlIGNvbnRleHQgaW4gXCJy YXdcIiBmb3JtYXQuXG4iDQorIiAgICAgICAgICAtLXJhdyAgICAgICAgIC1SICAgICBTaG93IHRo ZSBjb250ZXh0IGluIFwicmF3XCIgZm9ybWF0LlxuIg0KICIgICAgICAgICAgLS1jdXJyZW50ICAg ICAgICAgICAgR2V0IHRoZSBjb250ZXh0IGZvciB0aGUgY3VycmVudCBwcm9jZXNzLlxuIg0KICIg ICAgICAgICAgLS1zZWxmICAgICAgICAgICAgICAgR2V0IHRoZSBjb250ZXh0IGZvciB0aGUgY3Vy cmVudCBwcm9jZXNzLlxuIg0KICIgICAgICAgICAgLS1zZWxmLWV4ZWMgICAgICAgICAgR2V0IHRo ZSBleGVjIGNvbnRleHQgZm9yIHRoZSBjdXJyZW50IHByb2Nlc3MuXG4iDQpAQCAtMTEzLDcgKzEx NSw4IEBADQogICBudW0gKz0gb3B0cy0+ZGlzcF91c2VyOw0KICAgbnVtICs9IG9wdHMtPmRpc3Bf cm9sZTsNCiAgIG51bSArPSBvcHRzLT5kaXNwX3R5cGU7DQotICBudW0gKz0gb3B0cy0+ZGlzcF9s ZXZlbDsNCisgIG51bSArPSBvcHRzLT5kaXNwX3NlbjsNCisgIG51bSArPSBvcHRzLT5kaXNwX2Ns cjsNCiAgIG51bSArPSBvcHRzLT5kaXNwX21sc3I7DQogICANCiAgIHJldHVybiAobnVtKTsNCkBA IC0xNDMsOCArMTQ2LDEwIEBADQogICAgICB7InVzZXIiLCAgICAgIG5vX2FyZ3VtZW50LCBOVUxM LCAndSd9LA0KICAgICAgeyJyb2xlIiwgICAgICBub19hcmd1bWVudCwgTlVMTCwgJ3InfSwNCiAg ICAgIHsidHlwZSIsICAgICAgbm9fYXJndW1lbnQsIE5VTEwsICd0J30sDQotICAgICB7ImxldmVs IiwgICAgIG5vX2FyZ3VtZW50LCBOVUxMLCAnbCd9LA0KKyAgICAgeyJsZXZlbCIsICAgICBub19h cmd1bWVudCwgTlVMTCwgJ2wnfSwgLyogY29tcGF0LiAqLw0KKyAgICAgeyJzZW5zaXRpdml0eSIs IG5vX2FyZ3VtZW50LCBOVUxMLCAncyd9LA0KICAgICAgeyJyYW5nZSIsICAgICBub19hcmd1bWVu dCwgTlVMTCwgJ20nfSwNCisgICAgIHsiY2xlYXJhbmNlIiwgbm9fYXJndW1lbnQsIE5VTEwsICdj J30sDQogICAgICB7Im1scy1yYW5nZSIsIG5vX2FyZ3VtZW50LCBOVUxMLCAnbSd9LA0KICAgICAg DQogICAgICB7InJhdyIsIG5vX2FyZ3VtZW50LCBOVUxMLCAnUid9LA0KQEAgLTE4NCwxMSArMTg5 LDEzIEBADQogICAgICAgICAgICAgICAgICIgJXMgdmVyc2lvbiAlcy5cbiIsIHByb2dyYW1fbmFt ZSwgVkVSU0lPTik7DQogICAgICAgICBleGl0IChFWElUX1NVQ0NFU1MpOw0KIA0KLSAgICAgIGNh c2UgJ3UnOiBkb25lID0gVFJVRTsgb3B0cy0+ZGlzcF91c2VyICA9ICFvcHRzLT5kaXNwX3VzZXI7 ICBicmVhazsNCi0gICAgICBjYXNlICdyJzogZG9uZSA9IFRSVUU7IG9wdHMtPmRpc3Bfcm9sZSAg PSAhb3B0cy0+ZGlzcF9yb2xlOyAgYnJlYWs7DQotICAgICAgY2FzZSAndCc6IGRvbmUgPSBUUlVF OyBvcHRzLT5kaXNwX3R5cGUgID0gIW9wdHMtPmRpc3BfdHlwZTsgIGJyZWFrOw0KLSAgICAgIGNh c2UgJ2wnOiBkb25lID0gVFJVRTsgb3B0cy0+ZGlzcF9sZXZlbCA9ICFvcHRzLT5kaXNwX2xldmVs OyBicmVhazsNCi0gICAgICBjYXNlICdtJzogZG9uZSA9IFRSVUU7IG9wdHMtPmRpc3BfbWxzciAg PSAhb3B0cy0+ZGlzcF9tbHNyOyBicmVhazsNCisgICAgICBjYXNlICd1JzogZG9uZSA9IFRSVUU7 IG9wdHMtPmRpc3BfdXNlciA9ICFvcHRzLT5kaXNwX3VzZXI7IGJyZWFrOw0KKyAgICAgIGNhc2Ug J3InOiBkb25lID0gVFJVRTsgb3B0cy0+ZGlzcF9yb2xlID0gIW9wdHMtPmRpc3Bfcm9sZTsgYnJl YWs7DQorICAgICAgY2FzZSAndCc6IGRvbmUgPSBUUlVFOyBvcHRzLT5kaXNwX3R5cGUgPSAhb3B0 cy0+ZGlzcF90eXBlOyBicmVhazsNCisgICAgICBjYXNlICdsJzogZG9uZSA9IFRSVUU7IG9wdHMt PmRpc3Bfc2VuICA9ICFvcHRzLT5kaXNwX3NlbjsgIGJyZWFrOw0KKyAgICAgIGNhc2UgJ3MnOiBk b25lID0gVFJVRTsgb3B0cy0+ZGlzcF9zZW4gID0gIW9wdHMtPmRpc3Bfc2VuOyAgYnJlYWs7DQor ICAgICAgY2FzZSAnYyc6IGRvbmUgPSBUUlVFOyBvcHRzLT5kaXNwX2NsciAgPSAhb3B0cy0+ZGlz cF9jbHI7ICBicmVhazsNCisgICAgICBjYXNlICdtJzogZG9uZSA9IFRSVUU7IG9wdHMtPmRpc3Bf bWxzciA9ICFvcHRzLT5kaXNwX21sc3I7IGJyZWFrOw0KIA0KICAgICAgIGNhc2UgJ1AnOiBvcHRz LT5kaXNwX3Byb21wdCA9ICFvcHRzLT5kaXNwX3Byb21wdDsgYnJlYWs7DQogICAgICAgICANCkBA IC0yMzUsOSArMjQyLDExIEBADQogICAgIG9wdHMtPmRpc3BfdXNlciAgPSBUUlVFOw0KICAgICBv cHRzLT5kaXNwX3JvbGUgID0gVFJVRTsNCiAgICAgb3B0cy0+ZGlzcF90eXBlICA9IFRSVUU7DQot ICAgIGlmICghb3B0cy0+ZGlzcF9wcm9tcHQpIC8qIHdoZW4gZGlzcGxheWluZyBwcm9tcHQsDQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGp1c3Qgb3V0cHV0ICJub3JtYWwiIGJ5IGRl ZmF1bHQgKi8NCi0gICAgICBvcHRzLT5kaXNwX2xldmVsID0gVFJVRTsNCisgICAgaWYgKCFvcHRz LT5kaXNwX3Byb21wdCkNCisgICAgeyAvKiB3aGVuIGRpc3BsYXlpbmcgcHJvbXB0LCBqdXN0IG91 dHB1dCAibm9ybWFsIiBieSBkZWZhdWx0ICovDQorICAgICAgb3B0cy0+ZGlzcF9zZW4gPSBUUlVF Ow0KKyAgICAgIG9wdHMtPmRpc3BfY2xyID0gVFJVRTsNCisgICAgfQ0KICAgICBvcHRzLT5kaXNw X21sc3IgID0gVFJVRTsNCiAgIH0NCiAgIA0KQEAgLTQ1OSwxMyArNDY4LDI0IEBADQogew0KICAg Y29udGV4dF90IGNvbiA9IE5VTEw7DQogDQorICBpZiAoISpzY29uKQ0KKyAgeyAvKiAtLXNlbGYt ZXhlYyBhbmQgLS1zZWxmLWZzIGV0Yy4gKi8NCisgICAgaWYgKG9wdHMtPmRpc3BfdXNlcikgZGlz cF9fY29uX3ZhbCgidXNlciIsIE5VTEwpOw0KKyAgICBpZiAob3B0cy0+ZGlzcF9yb2xlKSBkaXNw X19jb25fdmFsKCJyb2xlIiwgTlVMTCk7DQorICAgIGlmIChvcHRzLT5kaXNwX3R5cGUpIGRpc3Bf X2Nvbl92YWwoInR5cGUiLCBOVUxMKTsNCisgICAgaWYgKG9wdHMtPmRpc3Bfc2VuKSAgZGlzcF9f Y29uX3ZhbCgic2Vuc2l0aXZpdHkiLCBOVUxMKTsNCisgICAgaWYgKG9wdHMtPmRpc3BfY2xyKSAg ZGlzcF9fY29uX3ZhbCgiY2xlYXJhbmNlIiwgTlVMTCk7DQorICAgIGlmIChvcHRzLT5kaXNwX21s c3IpIGRpc3BfX2Nvbl92YWwoIm1scy1yYW5nZSIsIE5VTEwpOw0KKyAgICByZXR1cm47DQorICB9 ICANCisgIA0KICAgaWYgKCEoY29uID0gY29udGV4dF9uZXcoc2NvbikpKQ0KLSAgICBlcnJ4KEVY SVRfRkFJTFVSRSwgIkNvdWxuJ3QgY3JlYXRlIGNvbnRleHQgZnJvbTogJXMiLCBzY29uKTsNCisg ICAgZXJyeChFWElUX0ZBSUxVUkUsICJDb3VsZG4ndCBjcmVhdGUgY29udGV4dCBmcm9tOiAlcyIs IHNjb24pOw0KICAgDQogICBpZiAob3B0cy0+ZGlzcF91c2VyKSAgZGlzcF9fY29uX3ZhbCgidXNl ciIsICAgICAgY29udGV4dF91c2VyX2dldChjb24pKTsNCiAgIGlmIChvcHRzLT5kaXNwX3JvbGUp ICBkaXNwX19jb25fdmFsKCJyb2xlIiwgICAgICBjb250ZXh0X3JvbGVfZ2V0KGNvbikpOw0KICAg aWYgKG9wdHMtPmRpc3BfdHlwZSkgIGRpc3BfX2Nvbl92YWwoInR5cGUiLCAgICAgIGNvbnRleHRf dHlwZV9nZXQoY29uKSk7DQotICBpZiAob3B0cy0+ZGlzcF9sZXZlbCkNCisgIGlmIChvcHRzLT5k aXNwX3NlbikNCiAgIHsNCiAgICAgY29uc3QgY2hhciAqdmFsID0gTlVMTDsNCiAgICAgY2hhciAq dG1wID0gTlVMTDsNCkBAIC00NzYsMTMgKzQ5NiwzMiBAQA0KICAgICANCiAgICAgdG1wID0gc3Ry ZHVwKHZhbCk7DQogICAgIGlmICghdG1wKQ0KLSAgICAgIGVycngoRVhJVF9GQUlMVVJFLCAiQ291 bG4ndCBjcmVhdGUgY29udGV4dCBmcm9tOiAlcyIsIHNjb24pOw0KKyAgICAgIGVycngoRVhJVF9G QUlMVVJFLCAiQ291bGRuJ3QgY3JlYXRlIGNvbnRleHQgZnJvbTogJXMiLCBzY29uKTsNCiAgICAg aWYgKHN0cmNocih0bXAsICctJykpICpzdHJjaHIodG1wLCAnLScpID0gMDsNCiAgICAgDQotICAg IGRpc3BfX2Nvbl92YWwoImxldmVsIiwgdG1wKTsNCisgICAgZGlzcF9fY29uX3ZhbCgic2Vuc2l0 aXZpdHkiLCB0bXApOw0KIA0KICAgICBmcmVlKHRtcCk7DQogICB9DQorICBpZiAob3B0cy0+ZGlz cF9jbHIpDQorICB7DQorICAgIGNvbnN0IGNoYXIgKnZhbCA9IE5VTEw7DQorICAgIGNoYXIgKnRt cCA9IE5VTEw7DQorDQorICAgIHZhbCA9IGNvbnRleHRfcmFuZ2VfZ2V0KGNvbik7DQorICAgIGlm ICghdmFsKSB2YWwgPSAiIjsgLyogdGFyZ2V0ZWQgaGFzIG5vICJsZXZlbCIgZXRjLiwNCisgICAg ICAgICAgICAgICAgICAgICAgICAgICBhbnkgZXJyb3JzIHNob3VsZCBoYXBwZW4gYXQgY29udGV4 dF9uZXcoKSB0aW1lICovDQorICAgIA0KKyAgICB0bXAgPSBzdHJkdXAodmFsKTsNCisgICAgaWYg KCF0bXApDQorICAgICAgZXJyeChFWElUX0ZBSUxVUkUsICJDb3VsZG4ndCBjcmVhdGUgY29udGV4 dCBmcm9tOiAlcyIsIHNjb24pOw0KKyAgICBpZiAoc3RyY2hyKHRtcCwgJy0nKSkNCisgICAgICBk aXNwX19jb25fdmFsKCJjbGVhcmFuY2UiLCBzdHJjaHIodG1wLCAnLScpICsgMSk7DQorICAgIGVs c2UNCisgICAgICBkaXNwX19jb25fdmFsKCJjbGVhcmFuY2UiLCB0bXApOw0KKw0KKyAgICBmcmVl KHRtcCk7DQorICB9DQogICANCiAgIGlmIChvcHRzLT5kaXNwX21sc3IpICBkaXNwX19jb25fdmFs KCJtbHMtcmFuZ2UiLCBjb250ZXh0X3JhbmdlX2dldChjb24pKTsNCiANCg== --=-9RwLwzZg4tu2sYU1K+Wq Content-Disposition: attachment; filename=selinux-audit-mass-relabel.patch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=selinux-audit-mass-relabel.patch; charset=UTF-8 SW5kZXg6IHBvbGljeWNvcmV1dGlscy9zZXRmaWxlcy9zZXRmaWxlcy5jDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQot LS0gcG9saWN5Y29yZXV0aWxzL3NldGZpbGVzL3NldGZpbGVzLmMJKHJldmlzaW9uIDE5KQ0KKysr IHBvbGljeWNvcmV1dGlscy9zZXRmaWxlcy9zZXRmaWxlcy5jCSh3b3JraW5nIGNvcHkpDQpAQCAt NzUsNyArNzUsMTIgQEANCiAjaW5jbHVkZSA8c2VsaW51eC9zZWxpbnV4Lmg+DQogI2luY2x1ZGUg PHN5c2xvZy5oPiANCiAjaW5jbHVkZSA8bGliZ2VuLmg+DQorI2luY2x1ZGUgPGxpYmF1ZGl0Lmg+ DQogDQorI2lmbmRlZiBBVURJVF9GU19SRUxBQkVMDQorI2RlZmluZSBBVURJVF9GU19SRUxBQkVM IDIzMDkNCisjZW5kaWYNCisNCiBzdGF0aWMgaW50IGFkZF9hc3NvYyA9IDE7DQogc3RhdGljIEZJ TEUgKm91dGZpbGU9TlVMTDsNCiBzdGF0aWMgaW50IGZvcmNlPTA7DQpAQCAtMzk1LDcgKzQwMCw3 IEBADQogDQogCS8qIHRyaW0gdHJhaWxpbmcgLywgaWYgcHJlc2VudCAqLw0KIAlsZW4gPSBzdHJs ZW4ocm9vdHBhdGgpOw0KLQl3aGlsZSAoJy8nID09IHJvb3RwYXRoW2xlbiAtIDFdKQ0KKwl3aGls ZSAobGVuICYmICgnLycgPT0gcm9vdHBhdGhbbGVuIC0gMV0pKQ0KIAkJcm9vdHBhdGhbLS1sZW5d ID0gMDsNCiAJcm9vdHBhdGhsZW4gPSBsZW47DQogfQ0KQEAgLTQ0MywxMSArNDQ4LDM1IEBADQog ICByZXR1cm4gMDsNCiB9DQogDQorc3RhdGljIHZvaWQgbWF5YmVfYXVkaXRfbWFzc19yZWxhYmVs KGludCBkb25lX3Jvb3QsIGludCBlcnJzKQ0KK3sNCisgIGludCBhdWRpdF9mZCA9IC0xOw0KKyAg aW50IHJjID0gMDsNCisgIA0KKyAgaWYgKCFkb25lX3Jvb3QpIC8qIG9ubHkgYXVkaXQgYSBmb3Jj ZWQgZnVsbCByZWxhYmVsICovDQorICAgIHJldHVybjsNCisgIA0KKyAgYXVkaXRfZmQgPSBhdWRp dF9vcGVuKCk7DQorDQorICBpZiAoYXVkaXRfZmQgPCAwKSB7DQorICAgIGZwcmludGYoc3RkZXJy LCAiRXJyb3IgY29ubmVjdGluZyB0byBhdWRpdCBzeXN0ZW0uXG4iKTsNCisgICAgcmV0dXJuOw0K KyAgfQ0KKw0KKyAgcmMgPSBhdWRpdF9sb2dfdXNlcl9tZXNzYWdlKGF1ZGl0X2ZkLCBBVURJVF9G U19SRUxBQkVMLA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJvcD1tYXNzIHJlbGFi ZWwiLCBOVUxMLCBOVUxMLCBOVUxMLCAhZXJycyk7DQorICBpZiAocmMgPD0gMCkgew0KKyAgICBm cHJpbnRmKHN0ZGVyciwgIkVycm9yIHNlbmRpbmcgYXVkaXQgbWVzc2FnZTogJXMuXG4iLCBzdHJl cnJvcihlcnJubykpOw0KKyAgfQ0KKyAgYXVkaXRfY2xvc2UoYXVkaXRfZmQpOw0KK30NCisNCiBp bnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpDQogew0KIAlzdHJ1Y3Qgc3RhdCBzYjsNCiAJ aW50IG9wdCwgcmMsIGk7DQotDQorICAgICAgICBpbnQgZG9uZV9yb290ID0gMDsgLyogaGF2ZSB3 ZSBwcm9jZXNzZWQgdGhlIC8gZGlyZWN0b3J5IGFzIGFuIGFyZyAqLw0KKyAgICAgICAgDQogCW1l bXNldChleGNsdWRlQXJyYXksMCwgc2l6ZW9mKGV4Y2x1ZGVBcnJheSkpOw0KIA0KIAkvKiBWYWxp ZGF0ZSBhbGwgZmlsZSBjb250ZXh0cyBkdXJpbmcgbWF0Y2hwYXRoY29uX2luaXQuICovDQpAQCAt NjE4LDYgKzY0Nyw4IEBADQogCX0NCiAJZWxzZSBmb3IgKDsgb3B0aW5kIDwgYXJnYzsgb3B0aW5k KyspDQogCXsNCisgICAgICAgICAgICAgICAgZG9uZV9yb290IHw9ICFzdHJjbXAoYXJndltvcHRp bmRdLCAiLyIpOw0KKyAgICAgICAgICAgICAgICANCiAJCWlmIChOVUxMICE9IHJvb3RwYXRoKSB7 DQogCQkJcXByaW50ZigiJXM6ICBsYWJlbGluZyBmaWxlcywgcHJldGVuZGluZyAlcyBpcyAvXG4i LA0KIAkJCQlhcmd2WzBdLCByb290cGF0aCk7DQpAQCAtNjQ4LDYgKzY3OSw3IEBADQogCQkJCWZw cmludGYoc3RkZXJyLA0KIAkJCQkiJXM6ICBlcnJvciB3aGlsZSBsYWJlbGluZyBmaWxlcyB1bmRl ciAlc1xuIiwNCiAJCQkJYXJndlswXSwgYXJndltvcHRpbmRdKTsNCisJCQkJbWF5YmVfYXVkaXRf bWFzc19yZWxhYmVsKGRvbmVfcm9vdCwgMSk7DQogCQkJCWV4aXQoMSk7DQogCQkJfQ0KIAkJfQ0K QEAgLTY2NCw2ICs2OTYsOCBAQA0KIAkJbWF0Y2hwYXRoY29uX2ZpbGVzcGVjX2Rlc3Ryb3koKTsN CiAJfQ0KIA0KKyAgICAgICAgbWF5YmVfYXVkaXRfbWFzc19yZWxhYmVsKGRvbmVfcm9vdCwgMCk7 DQorDQogCWlmICh3YXJuX25vX21hdGNoKQ0KIAkJbWF0Y2hwYXRoY29uX2NoZWNrbWF0Y2hlcyhh cmd2WzBdKTsNCiANCkluZGV4OiBwb2xpY3ljb3JldXRpbHMvc2V0ZmlsZXMvTWFrZWZpbGUNCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NCi0tLSBwb2xpY3ljb3JldXRpbHMvc2V0ZmlsZXMvTWFrZWZpbGUJKHJldmlzaW9u IDE5KQ0KKysrIHBvbGljeWNvcmV1dGlscy9zZXRmaWxlcy9NYWtlZmlsZQkod29ya2luZyBjb3B5 KQ0KQEAgLTcsNiArNyw3IEBADQogQ0ZMQUdTID0gLVdlcnJvciAtV2FsbCAtVyANCiBvdmVycmlk ZSBDRkxBR1MgKz0gLURfRklMRV9PRkZTRVRfQklUUz02NCAtSSQoUFJFRklYKS9pbmNsdWRlDQog TERMSUJTID0gLWxzZWxpbnV4IC1sc2Vwb2wgLUwkKExJQkRJUikNCitMRExJQlMgKz0gLWxhdWRp dA0KIA0KIGFsbDogc2V0ZmlsZXMNCiANCg== --=-9RwLwzZg4tu2sYU1K+Wq-- --=-m/GdlZaJ4WoWKO5LfPIE Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQBEdiC711eXTEMrxtQRAkklAJ9jOdSfoPDbYulsyZgeXPfSeSzr6ACdEMT1 /N9TwsZ/71Fz8iSCAbpwsLA= =btBf -----END PGP SIGNATURE----- --=-m/GdlZaJ4WoWKO5LfPIE-- -- 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.