kernel: update kernel 4.4 to version 4.4.21
Refresh patches for all targets that support kernel 4.4. Compile-tested on brcm2708 only. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>v19.07.3_mercusys_ac12_duma
Álvaro Fernández Rojas
8 years ago
parent
a530196f8d
commit
41eab9048b
@ -1,73 +0,0 @@
|
||||
From 0956254a2d5b9e2141385514553aeef694dfe3b5 Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Date: Mon, 8 Aug 2016 15:08:49 +0200
|
||||
Subject: [PATCH] ovl: don't copy up opaqueness
|
||||
|
||||
When a copy up of a directory occurs which has the opaque xattr set, the
|
||||
xattr remains in the upper directory. The immediate behavior with overlayfs
|
||||
is that the upper directory is not treated as opaque, however after a
|
||||
remount the opaque flag is used and upper directory is treated as opaque.
|
||||
This causes files created in the lower layer to be hidden when using
|
||||
multiple lower directories.
|
||||
|
||||
Fix by not copying up the opaque flag.
|
||||
|
||||
To reproduce:
|
||||
|
||||
----8<---------8<---------8<---------8<---------8<---------8<----
|
||||
mkdir -p l/d/s u v w mnt
|
||||
mount -t overlay overlay -olowerdir=l,upperdir=u,workdir=w mnt
|
||||
rm -rf mnt/d/
|
||||
mkdir -p mnt/d/n
|
||||
umount mnt
|
||||
mount -t overlay overlay -olowerdir=u:l,upperdir=v,workdir=w mnt
|
||||
touch mnt/d/foo
|
||||
umount mnt
|
||||
mount -t overlay overlay -olowerdir=u:l,upperdir=v,workdir=w mnt
|
||||
ls mnt/d
|
||||
----8<---------8<---------8<---------8<---------8<---------8<----
|
||||
|
||||
output should be: "foo n"
|
||||
|
||||
Reported-by: Derek McGowan <dmcg@drizz.net>
|
||||
Link: https://bugzilla.kernel.org/show_bug.cgi?id=151291
|
||||
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Cc: <stable@vger.kernel.org>
|
||||
---
|
||||
fs/overlayfs/copy_up.c | 2 ++
|
||||
fs/overlayfs/inode.c | 2 +-
|
||||
fs/overlayfs/overlayfs.h | 1 +
|
||||
3 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/fs/overlayfs/copy_up.c
|
||||
+++ b/fs/overlayfs/copy_up.c
|
||||
@@ -48,6 +48,8 @@ int ovl_copy_xattr(struct dentry *old, s
|
||||
}
|
||||
|
||||
for (name = buf; name < (buf + list_size); name += strlen(name) + 1) {
|
||||
+ if (ovl_is_private_xattr(name))
|
||||
+ continue;
|
||||
retry:
|
||||
size = vfs_getxattr(old, name, value, value_size);
|
||||
if (size == -ERANGE)
|
||||
--- a/fs/overlayfs/inode.c
|
||||
+++ b/fs/overlayfs/inode.c
|
||||
@@ -219,7 +219,7 @@ static int ovl_readlink(struct dentry *d
|
||||
}
|
||||
|
||||
|
||||
-static bool ovl_is_private_xattr(const char *name)
|
||||
+bool ovl_is_private_xattr(const char *name)
|
||||
{
|
||||
return strncmp(name, OVL_XATTR_PRE_NAME, OVL_XATTR_PRE_LEN) == 0;
|
||||
}
|
||||
--- a/fs/overlayfs/overlayfs.h
|
||||
+++ b/fs/overlayfs/overlayfs.h
|
||||
@@ -175,6 +175,7 @@ ssize_t ovl_getxattr(struct dentry *dent
|
||||
ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
|
||||
int ovl_removexattr(struct dentry *dentry, const char *name);
|
||||
struct inode *ovl_d_select_inode(struct dentry *dentry, unsigned file_flags);
|
||||
+bool ovl_is_private_xattr(const char *name);
|
||||
|
||||
struct inode *ovl_new_inode(struct super_block *sb, umode_t mode,
|
||||
struct ovl_entry *oe);
|
||||
@ -1,49 +0,0 @@
|
||||
From c11b9fdd6a612f376a5e886505f1c54c16d8c380 Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Date: Thu, 1 Sep 2016 11:11:59 +0200
|
||||
Subject: [PATCH] ovl: remove posix_acl_default from workdir
|
||||
|
||||
Clear out posix acl xattrs on workdir and also reset the mode after
|
||||
creation so that an inherited sgid bit is cleared.
|
||||
|
||||
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Cc: <stable@vger.kernel.org>
|
||||
---
|
||||
fs/overlayfs/super.c | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
--- a/fs/overlayfs/super.c
|
||||
+++ b/fs/overlayfs/super.c
|
||||
@@ -773,6 +773,10 @@ retry:
|
||||
struct kstat stat = {
|
||||
.mode = S_IFDIR | 0,
|
||||
};
|
||||
+ struct iattr attr = {
|
||||
+ .ia_valid = ATTR_MODE,
|
||||
+ .ia_mode = stat.mode,
|
||||
+ };
|
||||
|
||||
if (work->d_inode) {
|
||||
err = -EEXIST;
|
||||
@@ -788,6 +792,21 @@ retry:
|
||||
err = ovl_create_real(dir, work, &stat, NULL, NULL, true);
|
||||
if (err)
|
||||
goto out_dput;
|
||||
+
|
||||
+ err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_DEFAULT);
|
||||
+ if (err && err != -ENODATA)
|
||||
+ goto out_dput;
|
||||
+
|
||||
+ err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_ACCESS);
|
||||
+ if (err && err != -ENODATA)
|
||||
+ goto out_dput;
|
||||
+
|
||||
+ /* Clear any inherited mode bits */
|
||||
+ mutex_lock(&work->d_inode->i_mutex);
|
||||
+ err = notify_change(work, &attr, NULL);
|
||||
+ mutex_unlock(&work->d_inode->i_mutex);
|
||||
+ if (err)
|
||||
+ goto out_dput;
|
||||
}
|
||||
out_unlock:
|
||||
mutex_unlock(&dir->i_mutex);
|
||||
@ -1,53 +0,0 @@
|
||||
From 7cb35119d067191ce9ebc380a599db0b03cbd9d9 Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Date: Thu, 1 Sep 2016 11:12:00 +0200
|
||||
Subject: [PATCH] ovl: listxattr: use strnlen()
|
||||
|
||||
Be defensive about what underlying fs provides us in the returned xattr
|
||||
list buffer. If it's not properly null terminated, bail out with a warning
|
||||
insead of BUG.
|
||||
|
||||
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Cc: <stable@vger.kernel.org>
|
||||
---
|
||||
fs/overlayfs/inode.c | 17 ++++++++++-------
|
||||
1 file changed, 10 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/fs/overlayfs/inode.c
|
||||
+++ b/fs/overlayfs/inode.c
|
||||
@@ -277,7 +277,8 @@ ssize_t ovl_listxattr(struct dentry *den
|
||||
struct path realpath;
|
||||
enum ovl_path_type type = ovl_path_real(dentry, &realpath);
|
||||
ssize_t res;
|
||||
- int off;
|
||||
+ size_t len;
|
||||
+ char *s;
|
||||
|
||||
res = vfs_listxattr(realpath.dentry, list, size);
|
||||
if (res <= 0 || size == 0)
|
||||
@@ -287,17 +288,19 @@ ssize_t ovl_listxattr(struct dentry *den
|
||||
return res;
|
||||
|
||||
/* filter out private xattrs */
|
||||
- for (off = 0; off < res;) {
|
||||
- char *s = list + off;
|
||||
- size_t slen = strlen(s) + 1;
|
||||
+ for (s = list, len = res; len;) {
|
||||
+ size_t slen = strnlen(s, len) + 1;
|
||||
|
||||
- BUG_ON(off + slen > res);
|
||||
+ /* underlying fs providing us with an broken xattr list? */
|
||||
+ if (WARN_ON(slen > len))
|
||||
+ return -EIO;
|
||||
|
||||
+ len -= slen;
|
||||
if (ovl_is_private_xattr(s)) {
|
||||
res -= slen;
|
||||
- memmove(s, s + slen, res - off);
|
||||
+ memmove(s, s + slen, len);
|
||||
} else {
|
||||
- off += slen;
|
||||
+ s += slen;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From e1ff3dd1ae52cef5b5373c8cc4ad949c2c25a71c Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Date: Mon, 5 Sep 2016 13:55:20 +0200
|
||||
Subject: [PATCH] ovl: fix workdir creation
|
||||
|
||||
Workdir creation fails in latest kernel.
|
||||
|
||||
Fix by allowing EOPNOTSUPP as a valid return value from
|
||||
vfs_removexattr(XATTR_NAME_POSIX_ACL_*). Upper filesystem may not support
|
||||
ACL and still be perfectly able to support overlayfs.
|
||||
|
||||
Reported-by: Martin Ziegler <ziegler@uni-freiburg.de>
|
||||
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
|
||||
Fixes: c11b9fdd6a61 ("ovl: remove posix_acl_default from workdir")
|
||||
Cc: <stable@vger.kernel.org>
|
||||
---
|
||||
fs/overlayfs/super.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/fs/overlayfs/super.c
|
||||
+++ b/fs/overlayfs/super.c
|
||||
@@ -794,11 +794,11 @@ retry:
|
||||
goto out_dput;
|
||||
|
||||
err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_DEFAULT);
|
||||
- if (err && err != -ENODATA)
|
||||
+ if (err && err != -ENODATA && err != -EOPNOTSUPP)
|
||||
goto out_dput;
|
||||
|
||||
err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_ACCESS);
|
||||
- if (err && err != -ENODATA)
|
||||
+ if (err && err != -ENODATA && err != -EOPNOTSUPP)
|
||||
goto out_dput;
|
||||
|
||||
/* Clear any inherited mode bits */
|
||||
Loading…
Reference in New Issue