Merging debian version 4.19.282-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 37 insertions, 71 deletions

diff --git a/debian/patches/features/all/aufs4/aufs4-standalone.patch b/debian/patches/features/all/aufs4/aufs4-standalone.patch
index 0a682c2f5..1b1480b26 100644
--- a/debian/patches/features/all/aufs4/aufs4-standalone.patch
+++ b/debian/patches/features/all/aufs4/aufs4-standalone.patch
@@ -9,11 +9,9 @@ Patch headers added by debian/bin/genpatch-aufs
 SPDX-License-Identifier: GPL-2.0
 aufs4.19.63+ standalone patch
 
-diff --git a/fs/dcache.c b/fs/dcache.c
-index 3bd53094ac3d..d6b2f7a994f4 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1339,6 +1339,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1341,6 +1341,7 @@ rename_retry:
  	seq = 1;
  	goto again;
  }
@@ -21,7 +19,7 @@ index 3bd53094ac3d..d6b2f7a994f4 100644
  
  struct check_mount {
  	struct vfsmount *mnt;
-@@ -2835,6 +2836,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
+@@ -2852,6 +2853,7 @@ void d_exchange(struct dentry *dentry1,
  
  	write_sequnlock(&rename_lock);
  }
@@ -29,11 +27,9 @@ index 3bd53094ac3d..d6b2f7a994f4 100644
  
  /**
   * d_ancestor - search for an ancestor
-diff --git a/fs/exec.c b/fs/exec.c
-index 433b1257694a..504c56308700 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
-@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
+@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path
  	return (path->mnt->mnt_flags & MNT_NOEXEC) ||
  	       (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
  }
@@ -41,11 +37,9 @@ index 433b1257694a..504c56308700 100644
  
  #ifdef CONFIG_USELIB
  /*
-diff --git a/fs/fcntl.c b/fs/fcntl.c
-index c91b3e3c4580..77513097f04c 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
-@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
+@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, un
   out:
  	return error;
  }
@@ -53,11 +47,9 @@ index c91b3e3c4580..77513097f04c 100644
  
  static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
                       int force)
-diff --git a/fs/file_table.c b/fs/file_table.c
-index e49af4caf15d..569020fd1fb3 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
-@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
+@@ -161,6 +161,7 @@ over:
  	}
  	return ERR_PTR(-ENFILE);
  }
@@ -73,7 +65,7 @@ index e49af4caf15d..569020fd1fb3 100644
  
  static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput);
  
-@@ -365,6 +367,7 @@ void __fput_sync(struct file *file)
+@@ -370,6 +372,7 @@ void __fput_sync(struct file *file)
  }
  
  EXPORT_SYMBOL(fput);
@@ -81,11 +73,9 @@ index e49af4caf15d..569020fd1fb3 100644
  
  void __init files_init(void)
  {
-diff --git a/fs/inode.c b/fs/inode.c
-index 43046d7223e4..36146c757aa2 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1666,6 +1666,7 @@ int update_time(struct inode *inode, struct timespec64 *time, int flags)
+@@ -1673,6 +1673,7 @@ int update_time(struct inode *inode, str
  
  	return update_time(inode, time, flags);
  }
@@ -93,11 +83,9 @@ index 43046d7223e4..36146c757aa2 100644
  
  /**
   *	touch_atime	-	update the access time
-diff --git a/fs/namespace.c b/fs/namespace.c
-index fbd7edd49a2f..d6eca814d9fc 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -437,6 +437,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
+@@ -437,6 +437,7 @@ void __mnt_drop_write(struct vfsmount *m
  	mnt_dec_writers(real_mount(mnt));
  	preempt_enable();
  }
@@ -105,7 +93,7 @@ index fbd7edd49a2f..d6eca814d9fc 100644
  
  /**
   * mnt_drop_write - give up write access to a mount
-@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *mnt)
+@@ -775,6 +776,7 @@ int is_current_mnt_ns(struct vfsmount *m
  {
  	return check_mnt(real_mount(mnt));
  }
@@ -113,7 +101,7 @@ index fbd7edd49a2f..d6eca814d9fc 100644
  
  /*
   * vfsmount lock must be held for write
-@@ -1844,6 +1846,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1880,6 +1882,7 @@ int iterate_mounts(int (*f)(struct vfsmo
  	}
  	return 0;
  }
@@ -121,11 +109,9 @@ index fbd7edd49a2f..d6eca814d9fc 100644
  
  static void cleanup_group_ids(struct mount *mnt, struct mount *end)
  {
-diff --git a/fs/notify/group.c b/fs/notify/group.c
-index c03b83662876..94d210ca384a 100644
 --- a/fs/notify/group.c
 +++ b/fs/notify/group.c
-@@ -112,6 +112,7 @@ void fsnotify_get_group(struct fsnotify_group *group)
+@@ -112,6 +112,7 @@ void fsnotify_get_group(struct fsnotify_
  {
  	refcount_inc(&group->refcnt);
  }
@@ -133,7 +119,7 @@ index c03b83662876..94d210ca384a 100644
  
  /*
   * Drop a reference to a group.  Free it if it's through.
-@@ -121,6 +122,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+@@ -121,6 +122,7 @@ void fsnotify_put_group(struct fsnotify_
  	if (refcount_dec_and_test(&group->refcnt))
  		fsnotify_final_destroy_group(group);
  }
@@ -141,7 +127,7 @@ index c03b83662876..94d210ca384a 100644
  
  /*
   * Create a new fsnotify_group and hold a reference for the group returned.
-@@ -150,6 +152,7 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+@@ -150,6 +152,7 @@ struct fsnotify_group *fsnotify_alloc_gr
  
  	return group;
  }
@@ -149,11 +135,9 @@ index c03b83662876..94d210ca384a 100644
  
  int fsnotify_fasync(int fd, struct file *file, int on)
  {
-diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 09535f6423fc..e9401ec71fc7 100644
 --- a/fs/notify/mark.c
 +++ b/fs/notify/mark.c
-@@ -285,6 +285,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+@@ -285,6 +285,7 @@ void fsnotify_put_mark(struct fsnotify_m
  	queue_delayed_work(system_unbound_wq, &reaper_work,
  			   FSNOTIFY_REAPER_DELAY);
  }
@@ -161,7 +145,7 @@ index 09535f6423fc..e9401ec71fc7 100644
  
  /*
   * Get mark reference when we found the mark via lockless traversal of object
-@@ -439,6 +440,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark,
+@@ -439,6 +440,7 @@ void fsnotify_destroy_mark(struct fsnoti
  	mutex_unlock(&group->mark_mutex);
  	fsnotify_free_mark(mark);
  }
@@ -169,7 +153,7 @@ index 09535f6423fc..e9401ec71fc7 100644
  
  /*
   * Sorting function for lists of fsnotify marks.
-@@ -654,6 +656,7 @@ int fsnotify_add_mark(struct fsnotify_mark *mark, fsnotify_connp_t *connp,
+@@ -654,6 +656,7 @@ int fsnotify_add_mark(struct fsnotify_ma
  	mutex_unlock(&group->mark_mutex);
  	return ret;
  }
@@ -177,7 +161,7 @@ index 09535f6423fc..e9401ec71fc7 100644
  
  /*
   * Given a list of marks, find the mark associated with given group. If found
-@@ -777,6 +780,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+@@ -777,6 +780,7 @@ void fsnotify_init_mark(struct fsnotify_
  	fsnotify_get_group(group);
  	mark->group = group;
  }
@@ -185,11 +169,9 @@ index 09535f6423fc..e9401ec71fc7 100644
  
  /*
   * Destroy all marks in destroy_list, waits for SRCU period to finish before
-diff --git a/fs/open.c b/fs/open.c
-index 878478745924..ab755f585f29 100644
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, l
  	inode_unlock(dentry->d_inode);
  	return ret;
  }
@@ -197,11 +179,9 @@ index 878478745924..ab755f585f29 100644
  
  long vfs_truncate(const struct path *path, loff_t length)
  {
-diff --git a/fs/read_write.c b/fs/read_write.c
-index c1335b4f19c0..6ed1f2ddcb03 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
+@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char
  
  	return ret;
  }
@@ -217,7 +197,7 @@ index c1335b4f19c0..6ed1f2ddcb03 100644
  
  vfs_writef_t vfs_writef(struct file *file)
  {
-@@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *file)
+@@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *fil
  		return new_sync_write;
  	return ERR_PTR(-ENOSYS);
  }
@@ -225,7 +205,7 @@ index c1335b4f19c0..6ed1f2ddcb03 100644
  
  ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
  {
-@@ -579,6 +582,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+@@ -579,6 +582,7 @@ ssize_t vfs_write(struct file *file, con
  
  	return ret;
  }
@@ -233,11 +213,9 @@ index c1335b4f19c0..6ed1f2ddcb03 100644
  
  static inline loff_t file_pos_read(struct file *file)
  {
-diff --git a/fs/splice.c b/fs/splice.c
-index b2c2d320565b..8250f2366329 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -851,6 +851,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -851,6 +851,7 @@ long do_splice_from(struct pipe_inode_in
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -245,7 +223,7 @@ index b2c2d320565b..8250f2366329 100644
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -880,6 +881,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -880,6 +881,7 @@ long do_splice_to(struct file *in, loff_
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -253,11 +231,9 @@ index b2c2d320565b..8250f2366329 100644
  
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/fs/sync.c b/fs/sync.c
-index 28607828e96f..ffd7ea43831e 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
-@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
+@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block
  		sb->s_op->sync_fs(sb, wait);
  	return __sync_blockdev(sb->s_bdev, wait);
  }
@@ -265,11 +241,9 @@ index 28607828e96f..ffd7ea43831e 100644
  
  /*
   * Write out and wait upon all dirty data associated with this
-diff --git a/fs/xattr.c b/fs/xattr.c
-index 0d6a6a4af861..7ce4701b7289 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
-@@ -295,6 +295,7 @@ vfs_getxattr_alloc(struct dentry *dentry, const char *name, char **xattr_value,
+@@ -332,6 +332,7 @@ vfs_getxattr_alloc(struct dentry *dentry
  	*xattr_value = value;
  	return error;
  }
@@ -277,11 +251,9 @@ index 0d6a6a4af861..7ce4701b7289 100644
  
  ssize_t
  __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index d0c9931e6531..0e5d9706723c 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
+@@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_
  	}
  	return lock_classes + hlock->class_idx - 1;
  }
@@ -289,8 +261,6 @@ index d0c9931e6531..0e5d9706723c 100644
  #define hlock_class(hlock) lockdep_hlock_class(hlock)
  
  #ifdef CONFIG_LOCK_STAT
-diff --git a/kernel/task_work.c b/kernel/task_work.c
-index 0fef395662a6..83fb1ecfc33d 100644
 --- a/kernel/task_work.c
 +++ b/kernel/task_work.c
 @@ -116,3 +116,4 @@ void task_work_run(void)
@@ -298,20 +268,16 @@ index 0fef395662a6..83fb1ecfc33d 100644
  	}
  }
 +EXPORT_SYMBOL_GPL(task_work_run);
-diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index dc28914fa72e..c2ddfea2b280 100644
 --- a/security/device_cgroup.c
 +++ b/security/device_cgroup.c
-@@ -824,3 +824,4 @@ int __devcgroup_check_permission(short type, u32 major, u32 minor,
+@@ -849,3 +849,4 @@ int __devcgroup_check_permission(short t
  
  	return 0;
  }
 +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
-diff --git a/security/security.c b/security/security.c
-index 5ce2448f3a45..3997af3462bc 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -542,6 +542,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -542,6 +542,7 @@ int security_path_rmdir(const struct pat
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
@@ -319,7 +285,7 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -558,6 +559,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -558,6 +559,7 @@ int security_path_symlink(const struct p
  		return 0;
  	return call_int_hook(path_symlink, 0, dir, dentry, old_name);
  }
@@ -327,7 +293,7 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -566,6 +568,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -566,6 +568,7 @@ int security_path_link(struct dentry *ol
  		return 0;
  	return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
  }
@@ -335,7 +301,7 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
  			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -593,6 +596,7 @@ int security_path_truncate(const struct path *path)
+@@ -593,6 +596,7 @@ int security_path_truncate(const struct
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
@@ -343,7 +309,7 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -600,6 +604,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -600,6 +604,7 @@ int security_path_chmod(const struct pat
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
@@ -351,7 +317,7 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -607,6 +612,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -607,6 +612,7 @@ int security_path_chown(const struct pat
  		return 0;
  	return call_int_hook(path_chown, 0, path, uid, gid);
  }
@@ -359,7 +325,7 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_path_chroot(const struct path *path)
  {
-@@ -707,6 +713,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -707,6 +713,7 @@ int security_inode_permission(struct ino
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -367,7 +333,7 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -878,6 +885,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -878,6 +885,7 @@ int security_file_permission(struct file
  
  	return fsnotify_perm(file, mask);
  }
@@ -375,9 +341,9 @@ index 5ce2448f3a45..3997af3462bc 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -937,6 +945,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -938,6 +946,7 @@ int security_mmap_file(struct file *file
  		return ret;
- 	return ima_file_mmap(file, prot);
+ 	return ima_file_mmap(file, prot, prot_adj, flags);
  }
 +EXPORT_SYMBOL_GPL(security_mmap_file);