libsysio-commit

[Libsysio-commit] HEAD: libsysio/src unlink.c

[Sonja T. <so...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8390

Modified Files:
	unlink.c 
Log Message:
Added ND_NOFOLLOW flag to namei call to fix unlink with symlinks


Index: unlink.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/unlink.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -b -B -p -r1.4 -r1.5
--- unlink.c	27 Sep 2003 19:42:03 -0000	1.4
+++ unlink.c	30 Oct 2003 15:20:49 -0000	1.5
@@ -60,7 +60,7 @@ unlink(const char *path)
 	struct pnode *pno;
 
 	INTENT_INIT(&intent, INT_UPDPARENT, NULL, NULL);
-	err = _sysio_namei(_sysio_cwd, path, 0, &intent, &pno);
+	err = _sysio_namei(_sysio_cwd, path, ND_NOFOLLOW, &intent, &pno);
 	if (err)
 		goto out;
 	if (IS_RDONLY(pno, pno->p_base->pb_ino)) {

[Libsysio-commit] HEAD: libsysio/src unlink.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29758

Modified Files:
	unlink.c 
Log Message:


Moved permission check from API call to the general p-node unlink so
all paths exercise it.


Index: unlink.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/unlink.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -b -B -p -r1.23 -r1.24
--- unlink.c	4 Aug 2009 15:01:24 -0000	1.23
+++ unlink.c	17 Aug 2009 17:47:22 -0000	1.24
@@ -68,6 +68,8 @@ _sysio_p_unlink(struct pnode *pno)
 		return -ENOENT;					/* huh? */
 	if (S_ISDIR(pno->p_base->pb_ino->i_stbuf.st_mode))
 		return -EISDIR;
+	err = _sysio_permitted(pno->p_parent, W_OK);
+		return -EPERM;
 	/*
 	 * Call the FS implementation.
 	 */
@@ -103,9 +105,6 @@ SYSIO_INTERFACE_NAME(unlink)(const char 
 			pno = NULL;
 			break;
 		}
-		err = _sysio_permitted(pno->p_parent, W_OK);
-		if (err)
-			break;
 		err = _sysio_p_unlink(pno);
 		if (err)
 			break;

[Libsysio-commit] HEAD: libsysio/src unlink.c

[Lee W. <lw...@us...>]

Update of /cvsroot/libsysio/libsysio/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2321/src

Modified Files:
	unlink.c 
Log Message:


When I moved the permission check to the p-node routine it was incomplete.
Now, check permission and return error if there was one, otherwise continue
on with the operation.


Index: unlink.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/unlink.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -b -B -p -r1.24 -r1.25
--- unlink.c	17 Aug 2009 17:47:22 -0000	1.24
+++ unlink.c	17 Aug 2009 23:28:41 -0000	1.25
@@ -69,7 +69,8 @@ _sysio_p_unlink(struct pnode *pno)
 	if (S_ISDIR(pno->p_base->pb_ino->i_stbuf.st_mode))
 		return -EISDIR;
 	err = _sysio_permitted(pno->p_parent, W_OK);
-		return -EPERM;
+	if (err)
+		return err;
 	/*
 	 * Call the FS implementation.
 	 */