From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48ehqOddj0vwltJ8SAEglvToBNd2vpLNOTxu2qYnTn6HzOKCSnONa6k0Z1gTjreBeSacdvJ ARC-Seal: i=1; a=rsa-sha256; t=1524405481; cv=none; d=google.com; s=arc-20160816; b=f23Vi+VlZukafsiKxbyY/kGNFikWhfvIsWUrHiuF5qmKIdWGvHySYXvv4rdKHD06K+ qwqRosevieAj6vjRFYvhbR9+qFAqk+YWBFZzS5X8EodFZ/Otlx7T+37vL9Khu8u/xib6 Gfc9LGxPhF5BUaZ7B3dV62zNfXoeeMZOEUOp8anRKWdvDJhG3IF5yuyq65/wvR7IgZDK Zp8LiiXLFKqTqNZ2M+RI9j57Gm473mZqJxJ5FJerkkS92jhLtFIsuMlQFPhxQgHG6Go2 HWWttO8TTMKPSC+sY/7SnQxUwLzif69xpva7dEAyloxCVU2YKnrdFl1jldGg5IA2xQGU KaAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=qSu2Fgnu/e/msM4SEFFy4JRf7pdb2T/0fS8GCe31MRE=; b=opFldL9g70PDoHv/7DBcaHDaOpdCWAeVVNOLIn5HmTZzW63Tc0KRBYAuaFq+/epoNF jNsfZ3sCAXkIZzNeAipdRxi6ASt5kKssz1LvqIO8bX/P1t0B6CNInnBcPcbpGex7t64P gW9gY03CR6F0n5ituU7tih8ARiVulsBUMCaPaPu7tQadPqgcaYTISNSaUU53XKQg945E 4FYWWj+3/yaNL60GhRAyptKncQIpDv6jWudNbdOY3Fwj4IMKuMSc8fPlQaqSQwPiUTwu gAwujVBxqQYF/51t1gEiVt+wcC/LMArg8K0FNmc0WTIiokyALwi3+GSwAkPVUoMkbGB/ s1sA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ronnie Sahlberg , Steve French Subject: [PATCH 4.16 046/196] fix smb3-encryption breakage when CONFIG_DEBUG_SG=y Date: Sun, 22 Apr 2018 15:51:06 +0200 Message-Id: <20180422135106.454575692@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135104.278511750@linuxfoundation.org> References: <20180422135104.278511750@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1598455002136448051?= X-GMAIL-MSGID: =?utf-8?q?1598455002136448051?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ronnie Sahlberg commit 262916bc69faf90104aa784d55e10760a4199594 upstream. We can not use the standard sg_set_buf() fucntion since when CONFIG_DEBUG_SG=y this adds a check that will BUG_ON for cifs.ko when we pass it an object from the stack. Create a new wrapper smb2_sg_set_buf() which avoids doing that particular check and use it for smb3 encryption instead. Signed-off-by: Ronnie Sahlberg Signed-off-by: Steve French CC: Stable Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2ops.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -2066,6 +2066,15 @@ fill_transform_hdr(struct smb2_transform inc_rfc1001_len(tr_hdr, orig_len); } +/* We can not use the normal sg_set_buf() as we will sometimes pass a + * stack object as buf. + */ +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)); +} + static struct scatterlist * init_sg(struct smb_rqst *rqst, u8 *sign) { @@ -2080,16 +2089,16 @@ init_sg(struct smb_rqst *rqst, u8 *sign) return NULL; sg_init_table(sg, sg_len); - sg_set_buf(&sg[0], rqst->rq_iov[0].iov_base + 24, assoc_data_len); + smb2_sg_set_buf(&sg[0], rqst->rq_iov[0].iov_base + 24, assoc_data_len); for (i = 1; i < rqst->rq_nvec; i++) - sg_set_buf(&sg[i], rqst->rq_iov[i].iov_base, + smb2_sg_set_buf(&sg[i], rqst->rq_iov[i].iov_base, rqst->rq_iov[i].iov_len); for (j = 0; i < sg_len - 1; i++, j++) { unsigned int len = (j < rqst->rq_npages - 1) ? rqst->rq_pagesz : rqst->rq_tailsz; sg_set_page(&sg[i], rqst->rq_pages[j], len, 0); } - sg_set_buf(&sg[sg_len - 1], sign, SMB2_SIGNATURE_SIZE); + smb2_sg_set_buf(&sg[sg_len - 1], sign, SMB2_SIGNATURE_SIZE); return sg; }