Re: [Linux-security-module-commit] lsm 2.5 tree change 1.2.1.63 1.381

chrisat_private

* bkat_private (bkat_private) wrote:
> chris changed the 2.5 LSM source tree.
> 
> Received the following changesets
> ---------------------
>     ChangeSetat_private, 2002-03-07 22:49:54-08:00, chrisat_private
>       Import patch 2.5.6-final
>       TAG: LINUX_2.5.6

I've merged upto 2.5.6.  LIDS, DTE and SELinux are not compiling.
The LOOKUP_POSITIVE flag has been removed from the kernel, and the
standard path name resolution interface has changed as well.  The simple
patch below gets everything compiling and using the new interface,
but does not necessarily handle negative dentries.

cheers,
-chris
(btw, i'll be gone most of the day tomorrow)

===== security/dte/mount.c 1.3 vs edited =====

--- 1.3/security/dte/mount.c	Thu Feb 14 15:39:49 2002
+++ edited/security/dte/mount.c	Fri Mar  8 00:12:38 2002
@@ -235,9 +235,8 @@
 		*/
 		/* make sure we check against the real pathname, no bind trickery */
 		printk(KERN_NOTICE "hooking up pretend for %s.\n",devp);
-		if (path_init(r->path,
-					LOOKUP_FOLLOW|LOOKUP_POSITIVE|LOOKUP_DIRECTORY, &nd2))
-			retval = path_walk(r->path, &nd2);
+		retval = path_lookup(r->path, LOOKUP_FOLLOW|LOOKUP_DIRECTORY,
+									&nd2);
 		if (retval) {
 			printk(KERN_NOTICE "dte_mount: path pretend %s does not exist!\n",
 					r->path);
===== security/dte/syscall.c 1.1 vs edited =====
--- 1.1/security/dte/syscall.c	Sat Dec 22 15:50:56 2001
+++ edited/security/dte/syscall.c	Fri Mar  8 00:13:10 2002
@@ -53,9 +53,7 @@
 	err = PTR_ERR(fnam);
 	if (IS_ERR(fnam))
 		goto out;
-	err = 0;
-	if (path_init(fnam,LOOKUP_POSITIVE|LOOKUP_FOLLOW,&nd))
-		err = path_walk(fnam, &nd);
+	err = path_lookup(fnam, LOOKUP_FOLLOW, &nd);
 	putname(fnam);
 	if (err)
 		goto out;
===== security/lids/lids_init.c 1.4 vs edited =====
--- 1.4/security/lids/lids_init.c	Mon Mar  4 06:57:18 2002
+++ edited/security/lids/lids_init.c	Fri Mar  8 00:13:42 2002
@@ -687,8 +687,7 @@
 	memset(data->fastguess,0,sizeof(data->fastguess));
 
 #ifndef CONFIG_LIDS_ALLOW_ANY_PROG_SWITCH
-	if (path_init(LIDS_ADM_PATH, LOOKUP_FOLLOW|LOOKUP_POSITIVE,&nd))
-		error = path_walk(LIDS_ADM_PATH,&nd);
+	error = path_lookup(LIDS_ADM_PATH, LOOKUP_FOLLOW, &nd);
 	if (error)
 		return -1;
 	/*
===== security/selinux/ss/global.h 1.2 vs edited =====
--- 1.2/security/selinux/ss/global.h	Thu Jan  3 07:54:17 2002
+++ edited/security/selinux/ss/global.h	Fri Mar  8 00:09:40 2002
@@ -95,8 +95,7 @@
 	if (strcmp(type, "r"))
 		panic("fopen");
 
-	if (path_init(path, LOOKUP_FOLLOW | LOOKUP_POSITIVE, &nd)) 
-		err = path_walk(path, &nd);
+	err = path_walk(path, LOOKUP_FOLLOW, &nd);
 	if (err)
 		return NULL;
 
_______________________________________________
linux-security-module mailing list
linux-security-moduleat_private
http://mail.wirex.com/mailman/listinfo/linux-security-module
