From: Yang Li <yang.lee@linux.alibaba.com> mainline inclusion from mainline-v6.2-rc1 commit d74f4a3f6d88a2416564bc6bf937e423a4ae8f8e category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/ICYBW6 CVE: CVE-2022-50341 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... -------------------------------- ./fs/cifs/cifsglob.h: linux/scatterlist.h is included more than once. Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3459 Fixes: f7f291e14dde ("cifs: fix oops during encryption") Reported-by: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com> Signed-off-by: Steve French <stfrench@microsoft.com> Conflicts: fs/cifs/cifsglob.h [Commit 49bd49f983b5 ("cifs: send workstation name during ntlmssp session setup") added inclusion of utsname.h in cifsglob.h.] Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> --- fs/cifs/cifsglob.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 3a5ad0add234..9a109ef73453 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -22,7 +22,6 @@ #include <linux/in.h> #include <linux/in6.h> #include <linux/slab.h> -#include <linux/scatterlist.h> #include <linux/mm.h> #include <linux/mempool.h> #include <linux/workqueue.h> -- 2.31.1