From b65123988c4287adf025b3fc2291c1d7fabf32fc Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 14 Jan 2021 14:25:48 +0100 Subject: [PATCH] base on Ubuntu Hirsute kernel drop applied patches and update README Signed-off-by: Thomas Lamprecht --- .gitmodules | 6 +- Makefile | 2 +- README | 4 +- ...scsi-Fix-a-theoretical-leak-in-beisc.patch | 47 ------- ...allow-unprivileged-whiteout-creation.patch | 122 ------------------ submodules/ubuntu-focal | 1 - submodules/ubuntu-hirsute | 1 + 7 files changed, 7 insertions(+), 176 deletions(-) delete mode 100644 patches/kernel/0007-Revert-scsi-be2iscsi-Fix-a-theoretical-leak-in-beisc.patch delete mode 100644 patches/kernel/0008-vfs-allow-unprivileged-whiteout-creation.patch delete mode 160000 submodules/ubuntu-focal create mode 160000 submodules/ubuntu-hirsute diff --git a/.gitmodules b/.gitmodules index f94dbc5..1f2eb7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "submodules/zfsonlinux"] path = submodules/zfsonlinux url = ../zfsonlinux -[submodule "submodules/ubuntu-focal"] - path = submodules/ubuntu-focal - url = ../mirror_ubuntu-focal-kernel +[submodule "submodules/ubuntu-hirsute"] + path = submodules/ubuntu-hirsute + url = ../mirror_ubuntu-hirsute-kernel diff --git a/Makefile b/Makefile index 7eb2715..3b2b657 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ SKIPABI=0 BUILD_DIR=build -KERNEL_SRC=ubuntu-focal +KERNEL_SRC=ubuntu-hirsute KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC) KERNEL_CFG_ORG=config-${KERNEL_VER}.org diff --git a/README b/README index 4646c22..042db01 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ KERNEL SOURCE: We currently use the Ubuntu kernel sources, available from: - http://kernel.ubuntu.com/git/ubuntu/ubuntu-focal.git/ + http://kernel.ubuntu.com/git/ubuntu/ubuntu-hirsute.git/ Ubuntu will maintain those kernels till: @@ -31,7 +31,7 @@ get applied with the `patch` tool. From a git point-of-view, the copied directory remains clean even with extra patches applied since it does not contain a .git directory, but a reference to the (still pristine) submodule: -$ cat build/ubuntu-focal/.git +$ cat build/ubuntu-hirsute/.git If you mistakenly cloned the upstream repo as "normal" clone (not via the submodule mechanics) this means that you have a real .git directory with its diff --git a/patches/kernel/0007-Revert-scsi-be2iscsi-Fix-a-theoretical-leak-in-beisc.patch b/patches/kernel/0007-Revert-scsi-be2iscsi-Fix-a-theoretical-leak-in-beisc.patch deleted file mode 100644 index 3467a5c..0000000 --- a/patches/kernel/0007-Revert-scsi-be2iscsi-Fix-a-theoretical-leak-in-beisc.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht -Date: Thu, 3 Dec 2020 07:45:18 +0100 -Subject: [PATCH] Revert "scsi: be2iscsi: Fix a theoretical leak in - beiscsi_create_eqs()" - -This reverts commit 552b270b5784dc322807df89eb359e74fc570fde. ---- - drivers/scsi/be2iscsi/be_main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c -index 0fa455357594..0760d0bd8a10 100644 ---- a/drivers/scsi/be2iscsi/be_main.c -+++ b/drivers/scsi/be2iscsi/be_main.c -@@ -3020,7 +3020,6 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, - goto create_eq_error; - } - -- mem->dma = paddr; - mem->va = eq_vaddress; - ret = be_fill_queue(eq, phba->params.num_eq_entries, - sizeof(struct be_eq_entry), eq_vaddress); -@@ -3030,6 +3029,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, - goto create_eq_error; - } - -+ mem->dma = paddr; - ret = beiscsi_cmd_eq_create(&phba->ctrl, eq, - BEISCSI_EQ_DELAY_DEF); - if (ret) { -@@ -3086,7 +3086,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, - goto create_cq_error; - } - -- mem->dma = paddr; - ret = be_fill_queue(cq, phba->params.num_cq_entries, - sizeof(struct sol_cqe), cq_vaddress); - if (ret) { -@@ -3096,6 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, - goto create_cq_error; - } - -+ mem->dma = paddr; - ret = beiscsi_cmd_cq_create(&phba->ctrl, cq, eq, false, - false, 0); - if (ret) { diff --git a/patches/kernel/0008-vfs-allow-unprivileged-whiteout-creation.patch b/patches/kernel/0008-vfs-allow-unprivileged-whiteout-creation.patch deleted file mode 100644 index 0cb12ba..0000000 --- a/patches/kernel/0008-vfs-allow-unprivileged-whiteout-creation.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Miklos Szeredi -Date: Thu, 14 May 2020 16:44:23 +0200 -Subject: [PATCH] vfs: allow unprivileged whiteout creation - -Whiteouts, unlike real device node should not require privileges to create. - -The general concern with device nodes is that opening them can have side -effects. The kernel already avoids zero major (see -Documentation/admin-guide/devices.txt). To be on the safe side the patch -explicitly forbids registering a char device with 0/0 number (see -cdev_add()). - -This guarantees that a non-O_PATH open on a whiteout will fail with ENODEV; -i.e. it won't have any side effect. - -Signed-off-by: Miklos Szeredi -(cherry picked from commit a3c751a50fe6bbe50eb7622a14b18b361804ee0c) -Signed-off-by: Thomas Lamprecht ---- - fs/char_dev.c | 3 +++ - fs/namei.c | 21 +++------------------ - include/linux/device_cgroup.h | 3 +++ - include/linux/fs.h | 6 +++++- - 4 files changed, 14 insertions(+), 19 deletions(-) - -diff --git a/fs/char_dev.c b/fs/char_dev.c -index c5e6eff5a381..ba0ded7842a7 100644 ---- a/fs/char_dev.c -+++ b/fs/char_dev.c -@@ -483,6 +483,9 @@ int cdev_add(struct cdev *p, dev_t dev, unsigned count) - p->dev = dev; - p->count = count; - -+ if (WARN_ON(dev == WHITEOUT_DEV)) -+ return -EBUSY; -+ - error = kobj_map(cdev_map, dev, count, NULL, - exact_match, exact_lock, p); - if (error) -diff --git a/fs/namei.c b/fs/namei.c -index 311da290a58d..4d46e093c4ea 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -3690,12 +3690,14 @@ EXPORT_SYMBOL(user_path_create); - - int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev) - { -+ bool is_whiteout = S_ISCHR(mode) && dev == WHITEOUT_DEV; - int error = may_create(dir, dentry); - - if (error) - return error; - -- if ((S_ISCHR(mode) || S_ISBLK(mode)) && !capable(CAP_MKNOD)) -+ if ((S_ISCHR(mode) || S_ISBLK(mode)) && !is_whiteout && -+ !capable(CAP_MKNOD)) - return -EPERM; - - if (!dir->i_op->mknod) -@@ -4530,9 +4532,6 @@ static int do_renameat2(int olddfd, const char __user *oldname, int newdfd, - (flags & RENAME_EXCHANGE)) - return -EINVAL; - -- if ((flags & RENAME_WHITEOUT) && !capable(CAP_MKNOD)) -- return -EPERM; -- - if (flags & RENAME_EXCHANGE) - target_flags = 0; - -@@ -4668,20 +4667,6 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna - return do_renameat2(AT_FDCWD, oldname, AT_FDCWD, newname, 0); - } - --int vfs_whiteout(struct inode *dir, struct dentry *dentry) --{ -- int error = may_create(dir, dentry); -- if (error) -- return error; -- -- if (!dir->i_op->mknod) -- return -EPERM; -- -- return dir->i_op->mknod(dir, dentry, -- S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV); --} --EXPORT_SYMBOL(vfs_whiteout); -- - int readlink_copy(char __user *buffer, int buflen, const char *link) - { - int len = PTR_ERR(link); -diff --git a/include/linux/device_cgroup.h b/include/linux/device_cgroup.h -index 8557efe096dc..fc989487c273 100644 ---- a/include/linux/device_cgroup.h -+++ b/include/linux/device_cgroup.h -@@ -62,6 +62,9 @@ static inline int devcgroup_inode_mknod(int mode, dev_t dev) - if (!S_ISBLK(mode) && !S_ISCHR(mode)) - return 0; - -+ if (S_ISCHR(mode) && dev == WHITEOUT_DEV) -+ return 0; -+ - if (S_ISBLK(mode)) - type = DEVCG_DEV_BLOCK; - else -diff --git a/include/linux/fs.h b/include/linux/fs.h -index 21f93dfaf9d0..ae31b55fb69c 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -1719,7 +1719,11 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct ino - extern int vfs_rmdir(struct inode *, struct dentry *); - extern int vfs_unlink(struct inode *, struct dentry *, struct inode **); - extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *, struct inode **, unsigned int); --extern int vfs_whiteout(struct inode *, struct dentry *); -+ -+static inline int vfs_whiteout(struct inode *dir, struct dentry *dentry) -+{ -+ return vfs_mknod(dir, dentry, S_IFCHR | WHITEOUT_MODE, WHITEOUT_DEV); -+} - - extern struct dentry *vfs_tmpfile(struct dentry *dentry, umode_t mode, - int open_flag); diff --git a/submodules/ubuntu-focal b/submodules/ubuntu-focal deleted file mode 160000 index f8a15b6..0000000 --- a/submodules/ubuntu-focal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8a15b6729cff5f5a39e1c941fa36f61c511df34 diff --git a/submodules/ubuntu-hirsute b/submodules/ubuntu-hirsute new file mode 160000 index 0000000..01f2ad6 --- /dev/null +++ b/submodules/ubuntu-hirsute @@ -0,0 +1 @@ +Subproject commit 01f2ad60c19fc07666c3cad5e6f527bc46af6303