Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1076 from Rmys/master

Browse Source 
cpupowertools
This commit is contained in:
Rmys
2020-04-03 22:13:41 +03:00
committed by GitHub
parent 196921fd9c 80e5d9088b
commit 7055519dde
8 changed files with 7126 additions and 6999 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/tools/cpupowertools/files/patches/linux/patch-5.4.16.xz
BIN
View File
Binary file not shown.
kernel/tools/cpupowertools/files/patches/linux/patch-5.4.19.xz
BIN
View File
Binary file not shown.
kernel/tools/cpupowertools/files/patches/linux/patch-5.5.15.xz
BIN
View File
Binary file not shown.
kernel/tools/cpupowertools/files/patches/mageia_5_4/CVE-2019-12379.patch → kernel/tools/cpupowertools/files/patches/mageia_5_5/CVE-2019-12379.patch
View File
kernel/tools/cpupowertools/files/patches/mageia_5_4/fs-aufs-5.4-modular.patch → kernel/tools/cpupowertools/files/patches/mageia_5_5/fs-aufs-5.5-modular.patch
+59 -68
View File
@@ -14,13 +14,12 @@
fs/xattr.c | 1 +
kernel/locking/lockdep.c | 1 +
kernel/task_work.c | 1 +
security/device_cgroup.c | 1 +
security/security.c | 8 ++++++++
17 files changed, 32 insertions(+), 1 deletion(-)
16 files changed, 31 insertions(+), 1 deletion(-)
diff -Nurp linux-5.4-aufs/fs/aufs/Kconfig linux-5.4-aufs-mod/fs/aufs/Kconfig
--- linux-5.4-aufs/fs/aufs/Kconfig 2019-11-28 01:25:59.062925618 +0200
+++ linux-5.4-aufs-mod/fs/aufs/Kconfig 2019-11-28 01:38:40.564895255 +0200
diff -Nurp linux-5.5.1-aufs/fs/aufs/Kconfig linux-5.5.1-aufs-mod/fs/aufs/Kconfig
--- linux-5.5.1-aufs/fs/aufs/Kconfig 2020-02-03 16:42:00.909434081 +0200
+++ linux-5.5.1-aufs-mod/fs/aufs/Kconfig 2020-02-03 16:48:04.663055726 +0200
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
config AUFS_FS
@@ -29,10 +28,10 @@ diff -Nurp linux-5.4-aufs/fs/aufs/Kconfig linux-5.4-aufs-mod/fs/aufs/Kconfig
help
Aufs is a stackable unification filesystem such as Unionfs,
which unifies several directories and provides a merged single
diff -Nurp linux-5.4-aufs/fs/dcache.c linux-5.4-aufs-mod/fs/dcache.c
--- linux-5.4-aufs/fs/dcache.c 2019-11-28 01:25:59.069925618 +0200
+++ linux-5.4-aufs-mod/fs/dcache.c 2019-11-28 01:38:40.585895254 +0200
@@ -1369,6 +1369,7 @@ rename_retry:
diff -Nurp linux-5.5.1-aufs/fs/dcache.c linux-5.5.1-aufs-mod/fs/dcache.c
--- linux-5.5.1-aufs/fs/dcache.c 2020-02-03 16:42:00.914434309 +0200
+++ linux-5.5.1-aufs-mod/fs/dcache.c 2020-02-03 16:48:20.289769719 +0200
@@ -1371,6 +1371,7 @@ rename_retry:
seq = 1;
goto again;
}
@@ -40,7 +39,7 @@ diff -Nurp linux-5.4-aufs/fs/dcache.c linux-5.4-aufs-mod/fs/dcache.c
struct check_mount {
struct vfsmount *mnt;
@@ -2914,6 +2915,7 @@ void d_exchange(struct dentry *dentry1,
@@ -2916,6 +2917,7 @@ void d_exchange(struct dentry *dentry1,
write_sequnlock(&rename_lock);
}
@@ -48,10 +47,10 @@ diff -Nurp linux-5.4-aufs/fs/dcache.c linux-5.4-aufs-mod/fs/dcache.c
/**
* d_ancestor - search for an ancestor
diff -Nurp linux-5.4-aufs/fs/exec.c linux-5.4-aufs-mod/fs/exec.c
--- linux-5.4-aufs/fs/exec.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/fs/exec.c 2019-11-28 01:38:40.589895254 +0200
@@ -110,6 +110,7 @@ bool path_noexec(const struct path *path
diff -Nurp linux-5.5.1-aufs/fs/exec.c linux-5.5.1-aufs-mod/fs/exec.c
--- linux-5.5.1-aufs/fs/exec.c 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-aufs-mod/fs/exec.c 2020-02-03 16:48:20.289769719 +0200
@@ -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);
}
@@ -59,10 +58,10 @@ diff -Nurp linux-5.4-aufs/fs/exec.c linux-5.4-aufs-mod/fs/exec.c
#ifdef CONFIG_USELIB
/*
diff -Nurp linux-5.4-aufs/fs/fcntl.c linux-5.4-aufs-mod/fs/fcntl.c
--- linux-5.4-aufs/fs/fcntl.c 2019-11-28 01:25:59.069925618 +0200
+++ linux-5.4-aufs-mod/fs/fcntl.c 2019-11-28 01:38:40.589895254 +0200
@@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, un
diff -Nurp linux-5.5.1-aufs/fs/fcntl.c linux-5.5.1-aufs-mod/fs/fcntl.c
--- linux-5.5.1-aufs/fs/fcntl.c 2020-02-03 16:42:00.914434309 +0200
+++ linux-5.5.1-aufs-mod/fs/fcntl.c 2020-02-03 16:48:20.289769719 +0200
@@ -85,6 +85,7 @@ int setfl(int fd, struct file *filp, uns
out:
return error;
}
@@ -70,9 +69,9 @@ diff -Nurp linux-5.4-aufs/fs/fcntl.c linux-5.4-aufs-mod/fs/fcntl.c
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force)
diff -Nurp linux-5.4-aufs/fs/file_table.c linux-5.4-aufs-mod/fs/file_table.c
--- linux-5.4-aufs/fs/file_table.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/fs/file_table.c 2019-11-28 01:38:40.589895254 +0200
diff -Nurp linux-5.5.1-aufs/fs/file_table.c linux-5.5.1-aufs-mod/fs/file_table.c
--- linux-5.5.1-aufs/fs/file_table.c 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-aufs-mod/fs/file_table.c 2020-02-03 16:48:20.289769719 +0200
@@ -162,6 +162,7 @@ over:
}
return ERR_PTR(-ENFILE);
@@ -81,7 +80,7 @@ diff -Nurp linux-5.4-aufs/fs/file_table.c linux-5.4-aufs-mod/fs/file_table.c
/*
* Variant of alloc_empty_file() that doesn't check and modify nr_files.
@@ -375,6 +377,7 @@ void __fput_sync(struct file *file)
@@ -375,6 +376,7 @@ void __fput_sync(struct file *file)
}
EXPORT_SYMBOL(fput);
@@ -89,10 +88,10 @@ diff -Nurp linux-5.4-aufs/fs/file_table.c linux-5.4-aufs-mod/fs/file_table.c
void __init files_init(void)
{
diff -Nurp linux-5.4-aufs/fs/inode.c linux-5.4-aufs-mod/fs/inode.c
--- linux-5.4-aufs/fs/inode.c 2019-11-28 01:25:59.070925617 +0200
+++ linux-5.4-aufs-mod/fs/inode.c 2019-11-28 01:38:40.589895254 +0200
@@ -1682,6 +1682,7 @@ int update_time(struct inode *inode, str
diff -Nurp linux-5.5.1-aufs/fs/inode.c linux-5.5.1-aufs-mod/fs/inode.c
--- linux-5.5.1-aufs/fs/inode.c 2020-02-03 16:42:00.914434309 +0200
+++ linux-5.5.1-aufs-mod/fs/inode.c 2020-02-03 16:48:20.290769764 +0200
@@ -1689,6 +1689,7 @@ int update_time(struct inode *inode, str
return update_time(inode, time, flags);
}
@@ -100,9 +99,9 @@ diff -Nurp linux-5.4-aufs/fs/inode.c linux-5.4-aufs-mod/fs/inode.c
/**
* touch_atime - update the access time
diff -Nurp linux-5.4-aufs/fs/namespace.c linux-5.4-aufs-mod/fs/namespace.c
--- linux-5.4-aufs/fs/namespace.c 2019-11-28 01:25:59.070925617 +0200
+++ linux-5.4-aufs-mod/fs/namespace.c 2019-11-28 01:38:40.589895254 +0200
diff -Nurp linux-5.5.1-aufs/fs/namespace.c linux-5.5.1-aufs-mod/fs/namespace.c
--- linux-5.5.1-aufs/fs/namespace.c 2020-02-03 16:42:00.914434309 +0200
+++ linux-5.5.1-aufs-mod/fs/namespace.c 2020-02-03 16:48:20.290769764 +0200
@@ -431,6 +431,7 @@ void __mnt_drop_write(struct vfsmount *m
mnt_dec_writers(real_mount(mnt));
preempt_enable();
@@ -127,9 +126,9 @@ diff -Nurp linux-5.4-aufs/fs/namespace.c linux-5.4-aufs-mod/fs/namespace.c
static void lock_mnt_tree(struct mount *mnt)
{
diff -Nurp linux-5.4-aufs/fs/notify/group.c linux-5.4-aufs-mod/fs/notify/group.c
--- linux-5.4-aufs/fs/notify/group.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/fs/notify/group.c 2019-11-28 01:38:40.590895253 +0200
diff -Nurp linux-5.5.1-aufs/fs/notify/group.c linux-5.5.1-aufs-mod/fs/notify/group.c
--- linux-5.5.1-aufs/fs/notify/group.c 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-aufs-mod/fs/notify/group.c 2020-02-03 16:48:20.290769764 +0200
@@ -99,6 +99,7 @@ void fsnotify_get_group(struct fsnotify_
{
refcount_inc(&group->refcnt);
@@ -138,9 +137,9 @@ diff -Nurp linux-5.4-aufs/fs/notify/group.c linux-5.4-aufs-mod/fs/notify/group.c
/*
* Drop a reference to a group. Free it if it's through.
diff -Nurp linux-5.4-aufs/fs/open.c linux-5.4-aufs-mod/fs/open.c
--- linux-5.4-aufs/fs/open.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/fs/open.c 2019-11-28 01:38:48.762894928 +0200
diff -Nurp linux-5.5.1-aufs/fs/open.c linux-5.5.1-aufs-mod/fs/open.c
--- linux-5.5.1-aufs/fs/open.c 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-aufs-mod/fs/open.c 2020-02-03 16:48:20.290769764 +0200
@@ -65,6 +65,7 @@ int do_truncate(struct dentry *dentry, l
inode_unlock(dentry->d_inode);
return ret;
@@ -149,9 +148,9 @@ diff -Nurp linux-5.4-aufs/fs/open.c linux-5.4-aufs-mod/fs/open.c
long vfs_truncate(const struct path *path, loff_t length)
{
diff -Nurp linux-5.4-aufs/fs/read_write.c linux-5.4-aufs-mod/fs/read_write.c
--- linux-5.4-aufs/fs/read_write.c 2019-11-28 01:25:59.070925617 +0200
+++ linux-5.4-aufs-mod/fs/read_write.c 2019-11-28 01:38:48.780894927 +0200
diff -Nurp linux-5.5.1-aufs/fs/read_write.c linux-5.5.1-aufs-mod/fs/read_write.c
--- linux-5.5.1-aufs/fs/read_write.c 2020-02-03 16:42:00.915434354 +0200
+++ linux-5.5.1-aufs-mod/fs/read_write.c 2020-02-03 16:48:20.290769764 +0200
@@ -468,6 +468,7 @@ ssize_t vfs_read(struct file *file, char
return ret;
@@ -162,7 +161,7 @@ diff -Nurp linux-5.4-aufs/fs/read_write.c linux-5.4-aufs-mod/fs/read_write.c
{
@@ -508,6 +509,7 @@ vfs_readf_t vfs_readf(struct file *file)
return new_sync_read;
return ERR_PTR(-ENOSYS);
return ERR_PTR(-ENOSYS); /* doesn't have ->read(|_iter)() op */
}
+EXPORT_SYMBOL_GPL(vfs_readf);
@@ -170,7 +169,7 @@ diff -Nurp linux-5.4-aufs/fs/read_write.c linux-5.4-aufs-mod/fs/read_write.c
{
@@ -519,6 +521,7 @@ vfs_writef_t vfs_writef(struct file *fil
return new_sync_write;
return ERR_PTR(-ENOSYS);
return ERR_PTR(-ENOSYS); /* doesn't have ->write(|_iter)() op */
}
+EXPORT_SYMBOL_GPL(vfs_writef);
@@ -184,10 +183,10 @@ diff -Nurp linux-5.4-aufs/fs/read_write.c linux-5.4-aufs-mod/fs/read_write.c
/* file_ppos returns &file->f_pos or NULL if file is stream */
static inline loff_t *file_ppos(struct file *file)
diff -Nurp linux-5.4-aufs/fs/splice.c linux-5.4-aufs-mod/fs/splice.c
--- linux-5.4-aufs/fs/splice.c 2019-11-28 01:25:59.071925617 +0200
+++ linux-5.4-aufs-mod/fs/splice.c 2019-11-28 01:38:48.780894927 +0200
@@ -847,6 +847,7 @@ long do_splice_from(struct pipe_inode_in
diff -Nurp linux-5.5.1-aufs/fs/splice.c linux-5.5.1-aufs-mod/fs/splice.c
--- linux-5.5.1-aufs/fs/splice.c 2020-02-03 16:42:00.915434354 +0200
+++ linux-5.5.1-aufs-mod/fs/splice.c 2020-02-03 16:48:20.290769764 +0200
@@ -862,6 +862,7 @@ long do_splice_from(struct pipe_inode_in
return splice_write(pipe, out, ppos, len, flags);
}
@@ -195,7 +194,7 @@ diff -Nurp linux-5.4-aufs/fs/splice.c linux-5.4-aufs-mod/fs/splice.c
/*
* Attempt to initiate a splice from a file to a pipe.
@@ -876,6 +877,7 @@ long do_splice_to(struct file *in, loff_
@@ -891,6 +892,7 @@ long do_splice_to(struct file *in, loff_
return splice_read(in, ppos, pipe, len, flags);
}
@@ -203,9 +202,9 @@ diff -Nurp linux-5.4-aufs/fs/splice.c linux-5.4-aufs-mod/fs/splice.c
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff -Nurp linux-5.4-aufs/fs/sync.c linux-5.4-aufs-mod/fs/sync.c
--- linux-5.4-aufs/fs/sync.c 2019-11-28 01:25:59.071925617 +0200
+++ linux-5.4-aufs-mod/fs/sync.c 2019-11-28 01:38:48.780894927 +0200
diff -Nurp linux-5.5.1-aufs/fs/sync.c linux-5.5.1-aufs-mod/fs/sync.c
--- linux-5.5.1-aufs/fs/sync.c 2020-02-03 16:42:00.915434354 +0200
+++ linux-5.5.1-aufs-mod/fs/sync.c 2020-02-03 16:48:20.290769764 +0200
@@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block
sb->s_op->sync_fs(sb, wait);
return __sync_blockdev(sb->s_bdev, wait);
@@ -214,9 +213,9 @@ diff -Nurp linux-5.4-aufs/fs/sync.c linux-5.4-aufs-mod/fs/sync.c
/*
* Write out and wait upon all dirty data associated with this
diff -Nurp linux-5.4-aufs/fs/xattr.c linux-5.4-aufs-mod/fs/xattr.c
--- linux-5.4-aufs/fs/xattr.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/fs/xattr.c 2019-11-28 01:38:48.780894927 +0200
diff -Nurp linux-5.5.1-aufs/fs/xattr.c linux-5.5.1-aufs-mod/fs/xattr.c
--- linux-5.5.1-aufs/fs/xattr.c 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-aufs-mod/fs/xattr.c 2020-02-03 16:48:20.290769764 +0200
@@ -296,6 +296,7 @@ vfs_getxattr_alloc(struct dentry *dentry
*xattr_value = value;
return error;
@@ -225,9 +224,9 @@ diff -Nurp linux-5.4-aufs/fs/xattr.c linux-5.4-aufs-mod/fs/xattr.c
ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff -Nurp linux-5.4-aufs/kernel/locking/lockdep.c linux-5.4-aufs-mod/kernel/locking/lockdep.c
--- linux-5.4-aufs/kernel/locking/lockdep.c 2019-11-28 01:25:59.072925617 +0200
+++ linux-5.4-aufs-mod/kernel/locking/lockdep.c 2019-11-28 01:38:48.780894927 +0200
diff -Nurp linux-5.5.1-aufs/kernel/locking/lockdep.c linux-5.5.1-aufs-mod/kernel/locking/lockdep.c
--- linux-5.5.1-aufs/kernel/locking/lockdep.c 2020-02-03 16:42:00.916434400 +0200
+++ linux-5.5.1-aufs-mod/kernel/locking/lockdep.c 2020-02-03 16:48:20.290769764 +0200
@@ -174,6 +174,7 @@ inline struct lock_class *lockdep_hlock_
*/
return lock_classes + class_idx;
@@ -236,25 +235,17 @@ diff -Nurp linux-5.4-aufs/kernel/locking/lockdep.c linux-5.4-aufs-mod/kernel/loc
#define hlock_class(hlock) lockdep_hlock_class(hlock)
#ifdef CONFIG_LOCK_STAT
diff -Nurp linux-5.4-aufs/kernel/task_work.c linux-5.4-aufs-mod/kernel/task_work.c
--- linux-5.4-aufs/kernel/task_work.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/kernel/task_work.c 2019-11-28 01:38:48.786894927 +0200
diff -Nurp linux-5.5.1-aufs/kernel/task_work.c linux-5.5.1-aufs-mod/kernel/task_work.c
--- linux-5.5.1-aufs/kernel/task_work.c 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-aufs-mod/kernel/task_work.c 2020-02-03 16:48:20.290769764 +0200
@@ -116,3 +116,4 @@ void task_work_run(void)
} while (work);
}
}
+EXPORT_SYMBOL_GPL(task_work_run);
diff -Nurp linux-5.4-aufs/security/device_cgroup.c linux-5.4-aufs-mod/security/device_cgroup.c
--- linux-5.4-aufs/security/device_cgroup.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/security/device_cgroup.c 2019-11-28 01:38:48.790894927 +0200
@@ -824,3 +824,4 @@ int __devcgroup_check_permission(short t
return 0;
}
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff -Nurp linux-5.4-aufs/security/security.c linux-5.4-aufs-mod/security/security.c
--- linux-5.4-aufs/security/security.c 2019-11-25 02:32:01.000000000 +0200
+++ linux-5.4-aufs-mod/security/security.c 2019-11-28 01:38:48.794894926 +0200
diff -Nurp linux-5.5.1-aufs/security/security.c linux-5.5.1-aufs-mod/security/security.c
--- linux-5.5.1-aufs/security/security.c 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-aufs-mod/security/security.c 2020-02-03 16:48:20.290769764 +0200
@@ -1036,6 +1036,7 @@ int security_path_rmdir(const struct pat
return 0;
return call_int_hook(path_rmdir, 0, dir, dentry);
kernel/tools/cpupowertools/files/patches/mageia_5_4/fs-aufs-5.4.patch → kernel/tools/cpupowertools/files/patches/mageia_5_5/fs-aufs-5.5.patch
+6959 -6794
View File
File diff suppressed because it is too large Load Diff
kernel/tools/cpupowertools/files/patches/mageia_5_4/fs-vboxsf.patch → kernel/tools/cpupowertools/files/patches/mageia_5_5/fs-vboxsf.patch
+95 -131
View File
@@ -14,113 +14,42 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20191028111744.143863-2-hdegoede@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
MAINTAINERS | 6 +
drivers/staging/Kconfig | 2 +
drivers/staging/Makefile | 1 +
drivers/staging/vboxsf/Kconfig | 10 +
drivers/staging/vboxsf/Makefile | 5 +
drivers/staging/vboxsf/TODO | 7 +
drivers/staging/vboxsf/dir.c | 418 ++++++++++++++
drivers/staging/vboxsf/file.c | 370 +++++++++++++
drivers/staging/vboxsf/shfl_hostintf.h | 901 +++++++++++++++++++++++++++++++
drivers/staging/vboxsf/super.c | 499 +++++++++++++++++
drivers/staging/vboxsf/utils.c | 550 +++++++++++++++++++
drivers/staging/vboxsf/vboxsf_wrappers.c | 371 +++++++++++++
drivers/staging/vboxsf/vfsmod.h | 138 +++++
MAINTAINERS | 6 +
drivers/staging/Kconfig | 2
drivers/staging/Makefile | 1
drivers/staging/vboxsf/Kconfig | 10 ++
drivers/staging/vboxsf/Makefile | 5 +
drivers/staging/vboxsf/TODO | 7 +
drivers/staging/vboxsf/dir.c | 418 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/staging/vboxsf/file.c | 370 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/staging/vboxsf/shfl_hostintf.h | 901 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/staging/vboxsf/super.c | 499 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/staging/vboxsf/utils.c | 550 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/staging/vboxsf/vboxsf_wrappers.c | 371 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/staging/vboxsf/vfsmod.h | 138 ++++++++++++++++++++++++++++
13 files changed, 3278 insertions(+)
create mode 100644 drivers/staging/vboxsf/Kconfig
create mode 100644 drivers/staging/vboxsf/Makefile
create mode 100644 drivers/staging/vboxsf/TODO
create mode 100644 drivers/staging/vboxsf/dir.c
create mode 100644 drivers/staging/vboxsf/file.c
create mode 100644 drivers/staging/vboxsf/shfl_hostintf.h
create mode 100644 drivers/staging/vboxsf/super.c
create mode 100644 drivers/staging/vboxsf/utils.c
create mode 100644 drivers/staging/vboxsf/vboxsf_wrappers.c
create mode 100644 drivers/staging/vboxsf/vfsmod.h
diff --git a/MAINTAINERS b/MAINTAINERS
index c6c34d04ce95..71789e42ed17 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17335,6 +17335,12 @@ F: include/linux/vbox_utils.h
F: include/uapi/linux/vbox*.h
F: drivers/virt/vboxguest/
diff -Nurp linux-5.5.1/drivers/staging/Kconfig linux-5.5.1-vboxsf/drivers/staging/Kconfig
--- linux-5.5.1/drivers/staging/Kconfig 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/Kconfig 2020-02-03 17:09:14.292974559 +0200
@@ -129,4 +129,6 @@ source "drivers/staging/hp/Kconfig"
+VIRTUAL BOX SHARED FOLDER VFS DRIVER:
+M: Hans de Goede <hdegoede@redhat.com>
+L: linux-fsdevel@vger.kernel.org
+S: Maintained
+F: drivers/staging/vboxsf/*
+
VIRTUAL SERIO DEVICE DRIVER
M: Stephen Chandler Paul <thatslyude@gmail.com>
S: Maintained
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 6f1fa4c849a1..927d29eb92c6 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -125,4 +125,6 @@ source "drivers/staging/exfat/Kconfig"
source "drivers/staging/qlge/Kconfig"
source "drivers/staging/wfx/Kconfig"
+source "drivers/staging/vboxsf/Kconfig"
+
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index a90f9b308c8d..f01f04199073 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -53,3 +53,4 @@ obj-$(CONFIG_UWB) += uwb/
obj-$(CONFIG_USB_WUSB) += wusbcore/
obj-$(CONFIG_EXFAT_FS) += exfat/
diff -Nurp linux-5.5.1/drivers/staging/Makefile linux-5.5.1-vboxsf/drivers/staging/Makefile
--- linux-5.5.1/drivers/staging/Makefile 2020-01-27 02:23:03.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/Makefile 2020-02-03 17:10:18.196890679 +0200
@@ -55,3 +55,4 @@ obj-$(CONFIG_EXFAT_FS) += exfat/
obj-$(CONFIG_QLGE) += qlge/
obj-$(CONFIG_NET_VENDOR_HP) += hp/
obj-$(CONFIG_WFX) += wfx/
+obj-$(CONFIG_VBOXSF_FS) += vboxsf/
diff --git a/drivers/staging/vboxsf/Kconfig b/drivers/staging/vboxsf/Kconfig
new file mode 100644
index 000000000000..b84586ae08b3
--- /dev/null
+++ b/drivers/staging/vboxsf/Kconfig
@@ -0,0 +1,10 @@
+config VBOXSF_FS
+ tristate "VirtualBox guest shared folder (vboxsf) support"
+ depends on X86 && VBOXGUEST
+ select NLS
+ help
+ VirtualBox hosts can share folders with guests, this driver
+ implements the Linux-guest side of this allowing folders exported
+ by the host to be mounted under Linux.
+
+ If you want to use shared folders in VirtualBox guests, answer Y or M.
diff --git a/drivers/staging/vboxsf/Makefile b/drivers/staging/vboxsf/Makefile
new file mode 100644
index 000000000000..9e4328e79623
--- /dev/null
+++ b/drivers/staging/vboxsf/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+
+obj-$(CONFIG_VBOXSF_FS) += vboxsf.o
+
+vboxsf-y := dir.o file.o utils.o vboxsf_wrappers.o super.o
diff --git a/drivers/staging/vboxsf/TODO b/drivers/staging/vboxsf/TODO
new file mode 100644
index 000000000000..8b9193d0d4f0
--- /dev/null
+++ b/drivers/staging/vboxsf/TODO
@@ -0,0 +1,7 @@
+TODO:
+- Find a file-system developer to review this and give their Reviewed-By
+- Address any items coming up during review
+- Move to fs/vboxfs
+
+Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+and Hans de Goede <hdegoede@redhat.com>
diff --git a/drivers/staging/vboxsf/dir.c b/drivers/staging/vboxsf/dir.c
new file mode 100644
index 000000000000..f260b5cc1646
--- /dev/null
+++ b/drivers/staging/vboxsf/dir.c
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/dir.c linux-5.5.1-vboxsf/drivers/staging/vboxsf/dir.c
--- linux-5.5.1/drivers/staging/vboxsf/dir.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/dir.c 2020-02-03 17:09:14.292974559 +0200
@@ -0,0 +1,418 @@
+// SPDX-License-Identifier: MIT
+/*
@@ -540,11 +469,9 @@ index 000000000000..f260b5cc1646
+ .getattr = vboxsf_getattr,
+ .setattr = vboxsf_setattr,
+};
diff --git a/drivers/staging/vboxsf/file.c b/drivers/staging/vboxsf/file.c
new file mode 100644
index 000000000000..4b61ccf83fca
--- /dev/null
+++ b/drivers/staging/vboxsf/file.c
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/file.c linux-5.5.1-vboxsf/drivers/staging/vboxsf/file.c
--- linux-5.5.1/drivers/staging/vboxsf/file.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/file.c 2020-02-03 17:09:14.293974605 +0200
@@ -0,0 +1,370 @@
+// SPDX-License-Identifier: MIT
+/*
@@ -916,11 +843,32 @@ index 000000000000..4b61ccf83fca
+const struct inode_operations vboxsf_lnk_iops = {
+ .get_link = vboxsf_get_link
+};
diff --git a/drivers/staging/vboxsf/shfl_hostintf.h b/drivers/staging/vboxsf/shfl_hostintf.h
new file mode 100644
index 000000000000..aca829062c12
--- /dev/null
+++ b/drivers/staging/vboxsf/shfl_hostintf.h
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/Kconfig linux-5.5.1-vboxsf/drivers/staging/vboxsf/Kconfig
--- linux-5.5.1/drivers/staging/vboxsf/Kconfig 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/Kconfig 2020-02-03 17:09:14.292974559 +0200
@@ -0,0 +1,10 @@
+config VBOXSF_FS
+ tristate "VirtualBox guest shared folder (vboxsf) support"
+ depends on X86 && VBOXGUEST
+ select NLS
+ help
+ VirtualBox hosts can share folders with guests, this driver
+ implements the Linux-guest side of this allowing folders exported
+ by the host to be mounted under Linux.
+
+ If you want to use shared folders in VirtualBox guests, answer Y or M.
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/Makefile linux-5.5.1-vboxsf/drivers/staging/vboxsf/Makefile
--- linux-5.5.1/drivers/staging/vboxsf/Makefile 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/Makefile 2020-02-03 17:09:14.292974559 +0200
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+
+obj-$(CONFIG_VBOXSF_FS) += vboxsf.o
+
+vboxsf-y := dir.o file.o utils.o vboxsf_wrappers.o super.o
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/shfl_hostintf.h linux-5.5.1-vboxsf/drivers/staging/vboxsf/shfl_hostintf.h
--- linux-5.5.1/drivers/staging/vboxsf/shfl_hostintf.h 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/shfl_hostintf.h 2020-02-03 17:09:14.293974605 +0200
@@ -0,0 +1,901 @@
+/* SPDX-License-Identifier: MIT */
+/*
@@ -1823,11 +1771,9 @@ index 000000000000..aca829062c12
+#define SHFL_CPARMS_SYMLINK (4)
+
+#endif
diff --git a/drivers/staging/vboxsf/super.c b/drivers/staging/vboxsf/super.c
new file mode 100644
index 000000000000..3913ffafa83b
--- /dev/null
+++ b/drivers/staging/vboxsf/super.c
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/super.c linux-5.5.1-vboxsf/drivers/staging/vboxsf/super.c
--- linux-5.5.1/drivers/staging/vboxsf/super.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/super.c 2020-02-03 17:09:14.293974605 +0200
@@ -0,0 +1,499 @@
+// SPDX-License-Identifier: MIT
+/*
@@ -2328,11 +2274,20 @@ index 000000000000..3913ffafa83b
+MODULE_AUTHOR("Oracle Corporation");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS_FS("vboxsf");
diff --git a/drivers/staging/vboxsf/utils.c b/drivers/staging/vboxsf/utils.c
new file mode 100644
index 000000000000..1870b69c824e
--- /dev/null
+++ b/drivers/staging/vboxsf/utils.c
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/TODO linux-5.5.1-vboxsf/drivers/staging/vboxsf/TODO
--- linux-5.5.1/drivers/staging/vboxsf/TODO 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/TODO 2020-02-03 17:09:14.292974559 +0200
@@ -0,0 +1,7 @@
+TODO:
+- Find a file-system developer to review this and give their Reviewed-By
+- Address any items coming up during review
+- Move to fs/vboxfs
+
+Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+and Hans de Goede <hdegoede@redhat.com>
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/utils.c linux-5.5.1-vboxsf/drivers/staging/vboxsf/utils.c
--- linux-5.5.1/drivers/staging/vboxsf/utils.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/utils.c 2020-02-03 17:09:14.293974605 +0200
@@ -0,0 +1,550 @@
+// SPDX-License-Identifier: MIT
+/*
@@ -2884,11 +2839,9 @@ index 000000000000..1870b69c824e
+
+ return err;
+}
diff --git a/drivers/staging/vboxsf/vboxsf_wrappers.c b/drivers/staging/vboxsf/vboxsf_wrappers.c
new file mode 100644
index 000000000000..bfc78a097dae
--- /dev/null
+++ b/drivers/staging/vboxsf/vboxsf_wrappers.c
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/vboxsf_wrappers.c linux-5.5.1-vboxsf/drivers/staging/vboxsf/vboxsf_wrappers.c
--- linux-5.5.1/drivers/staging/vboxsf/vboxsf_wrappers.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/vboxsf_wrappers.c 2020-02-03 17:09:14.293974605 +0200
@@ -0,0 +1,371 @@
+// SPDX-License-Identifier: MIT
+/*
@@ -3261,11 +3214,9 @@ index 000000000000..bfc78a097dae
+{
+ return vboxsf_call(SHFL_FN_SET_SYMLINKS, NULL, 0, NULL);
+}
diff --git a/drivers/staging/vboxsf/vfsmod.h b/drivers/staging/vboxsf/vfsmod.h
new file mode 100644
index 000000000000..de650d65fbe4
--- /dev/null
+++ b/drivers/staging/vboxsf/vfsmod.h
diff -Nurp linux-5.5.1/drivers/staging/vboxsf/vfsmod.h linux-5.5.1-vboxsf/drivers/staging/vboxsf/vfsmod.h
--- linux-5.5.1/drivers/staging/vboxsf/vfsmod.h 1970-01-01 02:00:00.000000000 +0200
+++ linux-5.5.1-vboxsf/drivers/staging/vboxsf/vfsmod.h 2020-02-03 17:09:14.293974605 +0200
@@ -0,0 +1,138 @@
+/* SPDX-License-Identifier: MIT */
+/*
@@ -3405,6 +3356,19 @@ index 000000000000..de650d65fbe4
+int vboxsf_set_symlinks(void);
+
+#endif
--
cgit 1.2-0.3.lf.el7
diff -Nurp linux-5.5.1/MAINTAINERS linux-5.5.1-vboxsf/MAINTAINERS
--- linux-5.5.1/MAINTAINERS 2020-02-03 17:07:34.925446142 +0200
+++ linux-5.5.1-vboxsf/MAINTAINERS 2020-02-03 17:09:14.292974559 +0200
@@ -17625,6 +17625,12 @@ F: include/linux/vbox_utils.h
F: include/uapi/linux/vbox*.h
F: drivers/virt/vboxguest/
+VIRTUAL BOX SHARED FOLDER VFS DRIVER:
+M: Hans de Goede <hdegoede@redhat.com>
+L: linux-fsdevel@vger.kernel.org
+S: Maintained
+F: drivers/staging/vboxsf/*
+
VIRTUAL SERIO DEVICE DRIVER
M: Stephen Chandler Paul <thatslyude@gmail.com>
S: Maintained
kernel/tools/cpupowertools/pspec.xml
+13 -6
View File
@@ -12,18 +12,18 @@
<IsA>app:console</IsA>
<Summary>CPU power management tools</Summary>
<Description>cpupowertools contains utilities to manage power management and frequency scaling policies of modern CPUs.</Description>
<Archive sha1sum="8fd0449a462c77f3e5b35848f4bf3c41411702d6" type="targz">https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.gz</Archive>
<Archive sha1sum="14054f92e11eaedef64d19376de01a9e7b53566a" type="targz">https://mirrors.edge.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.gz</Archive>
<BuildDependencies>
<Dependency>pciutils-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- Linux patches -->
<Patch level="1" compressionType="xz">patches/linux/patch-5.4.19.xz</Patch>
<Patch level="1" compressionType="xz">patches/linux/patch-5.5.15.xz</Patch>
<!-- Mageia Linux patches-->
<Patch level="1">patches/mageia_5_4/fs-aufs-5.4.patch</Patch>
<Patch level="1">patches/mageia_5_4/fs-aufs-5.4-modular.patch</Patch>
<Patch level="1">patches/mageia_5_4/fs-vboxsf.patch</Patch>
<Patch level="1">patches/mageia_5_4/CVE-2019-12379.patch</Patch>
<Patch level="1">patches/mageia_5_5/fs-aufs-5.5.patch</Patch>
<Patch level="1">patches/mageia_5_5/fs-aufs-5.5-modular.patch</Patch>
<Patch level="1">patches/mageia_5_5/fs-vboxsf.patch</Patch>
<Patch level="1">patches/mageia_5_5/CVE-2019-12379.patch</Patch>
<!-- <Patch level="1">patches/mageia_5_4/disable-mrproper-in-devel-rpms.patch</Patch> -->
<!-- Build fix -->
@@ -55,6 +55,13 @@
</Package>
<History>
<Update release="32">
<Date>2020-04-03</Date>
<Version>5.5.15</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="31">
<Date>2020-02-13</Date>
<Version>5.4.19</Version>