summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSebastien Tisserant <stisserant@wallix.com>2019-08-01 12:06:08 -0500
committerSteve French <stfrench@microsoft.com>2019-08-05 22:50:38 -0500
commitee9d66182392695535cc9fccfcb40c16f72de2a9 (patch)
treed350eb332727522f430901b46d8e4d3cf32d51a8 /fs
parent108624eaff6f17f1966e4a94dc7bc5df2c5115ee (diff)
downloadlinux-ee9d66182392695535cc9fccfcb40c16f72de2a9.tar.bz2
SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL
Fix kernel oops when mounting a encryptData CIFS share with CONFIG_DEBUG_VIRTUAL Signed-off-by: Sebastien Tisserant <stisserant@wallix.com> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/smb2ops.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 19589922ef2b..64a5864127be 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -3489,7 +3489,15 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, unsigned int orig_len,
static inline void smb2_sg_set_buf(struct scatterlist *sg, const void *buf,
unsigned int buflen)
{
- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
+ void *addr;
+ /*
+ * VMAP_STACK (at least) puts stack into the vmalloc address space
+ */
+ if (is_vmalloc_addr(buf))
+ addr = vmalloc_to_page(buf);
+ else
+ addr = virt_to_page(buf);
+ sg_set_page(sg, addr, buflen, offset_in_page(buf));
}
/* Assumes the first rqst has a transform header as the first iov.