2008-05-02 20:43:22

by Andrew Morton

[permalink] [raw]
Subject: [patch 2/5] nfs/lsm: make NFSv4 set LSM mount options

From: Eric Paris <[email protected]>

NFSv3 get_sb operations call into the LSM layer to set security options passed
from userspace. NFSv4 hooks were not originally added since it was reasonably
late in the merge window and NFSv3 was the only thing that had regressed (v4
has never supported any LSM options)

This patch makes NFSv4 call into the LSM to set security options rather than
just blindly dropping them with no notice to the user as happens today. This
patch was tested in a simple NFSv4 environment with the context= option and
appeared to work as expected.

Signed-off-by: Eric Paris <[email protected]>
Cc: Trond Myklebust <[email protected]>
Cc: "J. Bruce Fields" <[email protected]>
Cc: Stephen Smalley <[email protected]>
Acked-by: James Morris <[email protected]>
Cc: Casey Schaufler <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/nfs/super.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff -puN fs/nfs/super.c~nfs-lsm-make-nfsv4-set-lsm-mount-options fs/nfs/super.c
--- a/fs/nfs/super.c~nfs-lsm-make-nfsv4-set-lsm-mount-options
+++ a/fs/nfs/super.c
@@ -2015,6 +2015,10 @@ static int nfs4_get_sb(struct file_syste
goto error_splat_super;

+ error = security_sb_set_mnt_opts(s, &data.lsm_opts);
+ if (error)
+ goto error_splat_root;
s->s_flags |= MS_ACTIVE;
mnt->mnt_sb = s;
mnt->mnt_root = mntroot;
@@ -2031,6 +2035,8 @@ out_free:
goto out;

+ dput(mntroot);
@@ -2114,6 +2120,8 @@ static int nfs4_xdev_get_sb(struct file_
mnt->mnt_sb = s;
mnt->mnt_root = mntroot;

+ security_sb_clone_mnt_opts(data->sb, s);
dprintk("<-- nfs4_xdev_get_sb() = 0\n");
return 0;

@@ -2197,6 +2205,8 @@ static int nfs4_referral_get_sb(struct f
mnt->mnt_sb = s;
mnt->mnt_root = mntroot;

+ security_sb_clone_mnt_opts(data->sb, s);
dprintk("<-- nfs4_referral_get_sb() = 0\n");
return 0;