Attachment #310907 for bug #414779

View | Details | Raw Unified | Return to bug 414779
Collapse All | Expand All




	 * mount it if present for use in the calls below.  
	 */
	char *mntpoint = NULL;
	/* First make sure /sys is mounted */
	if (mount("sysfs", "/sys", "sysfs", 0, 0) == 0 || errno == EBUSY) {
		if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
			mntpoint = SELINUXMNT;
		} else {
			/* check old mountpoint */
			if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {
				mntpoint = OLDSELINUXMNT;
			}
		}
	} else {
		/* check old mountpoint */
		if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) {

Return to bug 414779

Lines 370-377 Link Here

(-)libselinux-2.1.9.orig/src/load_policy.c (-2 / +10 lines)
370	* mount it if present for use in the calls below.	370	* mount it if present for use in the calls below.
371	*/	371	*/
372	char *mntpoint = NULL;	372	char *mntpoint = NULL;
373	if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 \|\| errno == EBUSY) {	373	/* First make sure /sys is mounted */
374	mntpoint = SELINUXMNT;	374	if (mount("sysfs", "/sys", "sysfs", 0, 0) == 0 \|\| errno == EBUSY) {
		375	if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 \|\| errno == EBUSY) {
		376	mntpoint = SELINUXMNT;
		377	} else {
		378	/* check old mountpoint */
		379	if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 \|\| errno == EBUSY) {
		380	mntpoint = OLDSELINUXMNT;
		381	}
		382	}
375	} else {	383	} else {
376	/* check old mountpoint */	384	/* check old mountpoint */
377	if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 \|\| errno == EBUSY) {	385	if (mount(SELINUXFS, OLDSELINUXMNT, SELINUXFS, 0, 0) == 0 \|\| errno == EBUSY) {