← Back to branch summary

~ubuntu-branches/ubuntu/lucid/linux-lts-backport-natty/lucid-proposed

« back to all changes in this revision

Viewing changes to fs/ecryptfs/main.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Luis Henriques, Upstream Kernel Changes
  • Date: 2012-08-15 09:46:38 UTC
  • Revision ID: package-import@ubuntu.com-20120815094638-n6urjpliowtih76d
Tags: 2.6.38-15.66~lucid1
https://launchpad.net/bugs/1036914
https://launchpad.net/bugs/1024497
https://launchpad.net/bugs/1024497
https://launchpad.net/bugs/1009207
[Luis Henriques]

* Release Tracking Bug
  - LP: #1036914

[ Upstream Kernel Changes ]

* udf: Fortify loading of sparing table
  - LP: #1024497
  - CVE-2012-3400
* udf: Avoid run away loop when partition table length is corrupted
  - LP: #1024497
  - CVE-2012-3400
* eCryptfs: Gracefully refuse miscdev file ops on inherited/passed files
* eCryptfs: Copy up POSIX ACL and read-only flags from lower mount
  - LP: #1009207

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/ecryptfs/main.c
546
546
                goto out;
547
547
        }
548
548
 
549
 
        s->s_flags = flags;
550
549
        rc = bdi_setup_and_register(&sbi->bdi, "ecryptfs", BDI_CAP_MAP_COPY);
551
550
        if (rc)
552
551
                goto out1;
582
581
        }
583
582
 
584
583
        ecryptfs_set_superblock_lower(s, path.dentry->d_sb);
 
584
 
 
585
        /**
 
586
         * Set the POSIX ACL flag based on whether they're enabled in the lower
 
587
         * mount. Force a read-only eCryptfs mount if the lower mount is ro.
 
588
         * Allow a ro eCryptfs mount even when the lower mount is rw.
 
589
         */
 
590
        s->s_flags = flags & ~MS_POSIXACL;
 
591
        s->s_flags |= path.dentry->d_sb->s_flags & (MS_RDONLY | MS_POSIXACL);
 
592
 
585
593
        s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
586
594
        s->s_blocksize = path.dentry->d_sb->s_blocksize;
587
595
        s->s_magic = ECRYPTFS_SUPER_MAGIC;