diff options
author | Shyam Prasad N <sprasad@microsoft.com> | 2021-08-04 18:37:22 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-18 08:59:06 +0200 |
commit | 3db5cb922800c83c966a1763fb1a443327dafe06 (patch) | |
tree | 437b4c1e1527bb9ae12aabd7da19940027a4fd64 | |
parent | d1398e3715b15c7dc766d91daf2bdd534d374cd8 (diff) | |
download | linux-stable-3db5cb922800c83c966a1763fb1a443327dafe06.tar.gz linux-stable-3db5cb922800c83c966a1763fb1a443327dafe06.tar.bz2 linux-stable-3db5cb922800c83c966a1763fb1a443327dafe06.zip |
cifs: create sd context must be a multiple of 8
commit 7d3fc01796fc895e5fcce45c994c5a8db8120a8d upstream.
We used to follow the rule earlier that the create SD context
always be a multiple of 8. However, with the change:
cifs: refactor create_sd_buf() and and avoid corrupting the buffer
...we recompute the length, and we failed that rule.
Fixing that with this change.
Cc: <stable@vger.kernel.org> # v5.10+
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/cifs/smb2pdu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index ab509965656e..ca5102773b72 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2367,7 +2367,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) memcpy(aclptr, &acl, sizeof(struct cifs_acl)); buf->ccontext.DataLength = cpu_to_le32(ptr - (__u8 *)&buf->sd); - *len = ptr - (__u8 *)buf; + *len = roundup(ptr - (__u8 *)buf, 8); return buf; } |