1 files changed, 6 insertions, 2 deletions

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 346f668e7df0..7b2188181367 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -721,6 +721,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
         unsigned int stacklen = 0;
         unsigned int i;
         bool remote = false;
+        struct cred *cred;
         int err;
 
         err = -ENOMEM;
@@ -901,10 +902,13 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
         else
                 sb->s_d_op = &ovl_dentry_operations;
 
-        ufs->creator_cred = prepare_creds();
-        if (!ufs->creator_cred)
+        ufs->creator_cred = cred = prepare_creds();
+        if (!cred)
                 goto out_put_lower_mnt;
 
+        /* Never override disk quota limits or use reserved space */
+        cap_lower(cred->cap_effective, CAP_SYS_RESOURCE);
+
         err = -ENOMEM;
         oe = ovl_alloc_entry(numlower);
         if (!oe)