From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Chinner Subject: Re: [PATCH review 05/16] xfs: Update xfs_ioctl_setattr to handle projids in any user namespace Date: Tue, 19 Feb 2013 12:55:50 +1100 Message-ID: <20130219015550.GJ26694@dastard> References: <87txpaph4n.fsf@xmission.com> <1361149870-27732-1-git-send-email-ebiederm@xmission.com> <1361149870-27732-5-git-send-email-ebiederm@xmission.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Alex Elder , Linux Containers , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Ben Myers , linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: "Eric W. Biederman" Return-path: Content-Disposition: inline In-Reply-To: <1361149870-27732-5-git-send-email-ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org List-Id: linux-fsdevel.vger.kernel.org On Sun, Feb 17, 2013 at 05:10:58PM -0800, Eric W. Biederman wrote: > From: "Eric W. Biederman" > > - Convert the userspace value in fa->fsx_projid into a kprojid and > store it in the variable projid. > - Verify that xfs can store the projid after it is converted into > xfs's user namespace. > - Replace uses of fa->fsx_projid with projid throughout > xfs_ioctl_setattr. > > Cc: Ben Myers > Cc: Alex Elder > Cc: Dave Chinner > Signed-off-by: "Eric W. Biederman" > --- > fs/xfs/xfs_ioctl.c | 26 ++++++++++++++++++-------- > 1 files changed, 18 insertions(+), 8 deletions(-) > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index 016624b..4a55f50 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -925,6 +925,7 @@ xfs_ioctl_setattr( > struct xfs_dquot *gdqp = NULL; > struct xfs_dquot *olddquot = NULL; > int code; > + kprojid_t projid = INVALID_PROJID; > > trace_xfs_ioctl_setattr(ip); > > @@ -934,11 +935,20 @@ xfs_ioctl_setattr( > return XFS_ERROR(EIO); > > /* > - * Disallow 32bit project ids when projid32bit feature is not enabled. > + * Verify the specifid project id is valid. > */ > - if ((mask & FSX_PROJID) && (fa->fsx_projid > (__uint16_t)-1) && > - !xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb)) > - return XFS_ERROR(EINVAL); > + if (mask & FSX_PROJID) { > + projid = make_kprojid(current_user_ns(), fa->fsx_projid); > + if (!projid_valid(projid)) > + return XFS_ERROR(EINVAL); > + > + /* > + * Disallow 32bit project ids when projid32bit feature is not enabled. > + */ > + if ((from_kprojid(&init_user_ns, projid) > (__uint16_t)-1) && > + !xfs_sb_version_hasprojid32bit(&ip->i_mount->m_sb)) > + return XFS_ERROR(EINVAL); > + } That looks busted. Why does one use current_user_ns() and the other &init_user_ns()? Cheers, Dave. -- Dave Chinner david-FqsqvQoI3Ljby3iVrkZq2A@public.gmane.org