From owner-svn-src-all@FreeBSD.ORG Sat Apr 4 23:23:07 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A730D276; Sat, 4 Apr 2015 23:23:07 +0000 (UTC) Received: from mail-wg0-x22c.google.com (mail-wg0-x22c.google.com [IPv6:2a00:1450:400c:c00::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5E0ABBA0; Sat, 4 Apr 2015 23:23:07 +0000 (UTC) Received: by wgbdm7 with SMTP id dm7so1271701wgb.1; Sat, 04 Apr 2015 16:23:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=tRfw+YZN+Tfh8uXLPO5RCh/0fwYSrDoflJAyXpTxzM0=; b=vo0qfLjWugmYe482HhaHMOCQ3iNJTm4Rh55k7fpbXP2HZQTAj23wDhg0njYjzPFhvn 8YZDD0veTT3C9DdJIROWXxwiwzSAaHAQtirJ/RSkViORHyNAGY9rcj3ofcV8xO4quUZm s42sAKgTSXH4QQ/OB7ABRFHAHdbnzkmVwgdRYJ6DYT6Vhd77ySwhjhv130tpwW6dPxuG hem3jM52ujWg13Lz5cLOEiNJAch9JteyWckMQzhQOMa5rOyYkOZ7ZlEszfUdlE00ZVbP Qvd0N9Khhefbs3FdmhQ0Sp5rSVTv6UADBdmUj9p5vCeJkD1NTcgB1szOXBDI8fpL2jL9 FGnA== MIME-Version: 1.0 X-Received: by 10.194.109.70 with SMTP id hq6mr17477036wjb.77.1428189785598; Sat, 04 Apr 2015 16:23:05 -0700 (PDT) Sender: pluknet@gmail.com Received: by 10.27.20.6 with HTTP; Sat, 4 Apr 2015 16:23:05 -0700 (PDT) In-Reply-To: <201504042147.t34LltiZ084425@svn.freebsd.org> References: <201504042147.t34LltiZ084425@svn.freebsd.org> Date: Sun, 5 Apr 2015 02:23:05 +0300 X-Google-Sender-Auth: jD9vXvCJA816Wf2CskeyO9vjHLA Message-ID: Subject: Re: svn commit: r281086 - head/sys/kern From: Sergey Kandaurov To: Jilles Tjoelker Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Apr 2015 23:23:07 -0000 On 5 April 2015 at 00:47, Jilles Tjoelker wrote: > Author: jilles > Date: Sat Apr 4 21:47:54 2015 > New Revision: 281086 > URL: https://svnweb.freebsd.org/changeset/base/281086 > > Log: > utimensat: Correct Capsicum required capability rights. > > Modified: > head/sys/kern/vfs_syscalls.c > > Modified: head/sys/kern/vfs_syscalls.c > ============================================================================== > --- head/sys/kern/vfs_syscalls.c Sat Apr 4 21:34:26 2015 (r281085) > +++ head/sys/kern/vfs_syscalls.c Sat Apr 4 21:47:54 2015 (r281086) > @@ -3294,6 +3294,7 @@ kern_utimensat(struct thread *td, int fd > { > struct nameidata nd; > struct timespec ts[2]; > + cap_rights_t rights; > int error, flags; > > if (flag & ~AT_SYMLINK_NOFOLLOW) > @@ -3301,8 +3302,9 @@ kern_utimensat(struct thread *td, int fd > > if ((error = getutimens(tptr, tptrseg, ts, &flags)) != 0) > return (error); > - NDINIT_AT(&nd, LOOKUP, ((flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : > - FOLLOW) | AUDITVNODE1, pathseg, path, fd, td); > + NDINIT_ATRIGHTS(&nd, LOOKUP, ((flag & AT_SYMLINK_NOFOLLOW) ? NOFOLLOW : > + FOLLOW) | AUDITVNODE1, pathseg, path, fd, > + cap_rights_init(&rights, CAP_FUTIMES), td); > if ((error = namei(&nd)) != 0) > return (error); > /* > What about kern_lutimes()? It seems it needs CAP_FUTIMES as well due its path argument. -- wbr, pluknets