diff options
author | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
commit | 882ebfc28c389be86535bda4a7d9e407020356bf (patch) | |
tree | e8f3ddeda13196f40040f3ba4701ece5d38c63cc /fs/cifs/smb2inode.c | |
parent | mips/uapi: Add definition of TIOC[SG]RS485 (diff) | |
parent | Linux 3.17-rc5 (diff) | |
download | kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.gz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.xz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.zip |
Merge 3.17-rc5 into tty-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/cifs/smb2inode.c')
-rw-r--r-- | fs/cifs/smb2inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c index 0150182a4494..899bbc86f73e 100644 --- a/fs/cifs/smb2inode.c +++ b/fs/cifs/smb2inode.c @@ -131,7 +131,7 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, *adjust_tz = false; *symlink = false; - smb2_data = kzalloc(sizeof(struct smb2_file_all_info) + MAX_NAME * 2, + smb2_data = kzalloc(sizeof(struct smb2_file_all_info) + PATH_MAX * 2, GFP_KERNEL); if (smb2_data == NULL) return -ENOMEM; |