Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Sep 2012 21:00:36 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240930 - head/sys/kern
Message-ID:  <201209252100.q8PL0aFS094887@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Tue Sep 25 21:00:36 2012
New Revision: 240930
URL: http://svn.freebsd.org/changeset/base/240930

Log:
  Require CAP_DELETE on directory descriptor for unlinkat(2).
  
  Sponsored by:	FreeBSD Foundation
  MFC after:	2 weeks

Modified:
  head/sys/kern/vfs_syscalls.c

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c	Tue Sep 25 20:59:12 2012	(r240929)
+++ head/sys/kern/vfs_syscalls.c	Tue Sep 25 21:00:36 2012	(r240930)
@@ -1881,8 +1881,8 @@ kern_unlinkat(struct thread *td, int fd,
 
 restart:
 	bwillwrite();
-	NDINIT_AT(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE | AUDITVNODE1,
-	    pathseg, path, fd, td);
+	NDINIT_ATRIGHTS(&nd, DELETE, LOCKPARENT | LOCKLEAF | MPSAFE |
+	    AUDITVNODE1, pathseg, path, fd, CAP_DELETE, td);
 	if ((error = namei(&nd)) != 0)
 		return (error == EINVAL ? EPERM : error);
 	vfslocked = NDHASGIANT(&nd);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209252100.q8PL0aFS094887>