mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
3bb5da3837
613 changed files with 11365 additions and 7843 deletions
|
|
@ -800,7 +800,8 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
|
|||
mutex_unlock(&newsbsec->lock);
|
||||
}
|
||||
|
||||
int selinux_parse_opts_str(char *options, struct security_mnt_opts *opts)
|
||||
static int selinux_parse_opts_str(char *options,
|
||||
struct security_mnt_opts *opts)
|
||||
{
|
||||
char *p;
|
||||
char *context = NULL, *defcontext = NULL;
|
||||
|
|
@ -1629,6 +1630,12 @@ static inline u32 file_to_av(struct file *file)
|
|||
else
|
||||
av |= FILE__WRITE;
|
||||
}
|
||||
if (!av) {
|
||||
/*
|
||||
* Special file opened with flags 3 for ioctl-only use.
|
||||
*/
|
||||
av = FILE__IOCTL;
|
||||
}
|
||||
|
||||
return av;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue