diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:04 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-17 11:19:04 -0700 |
| commit | 6ca6974c8a3b97a00df9b6ec3b1d076d6ecf6e09 (patch) | |
| tree | 195f5ea61e8dca15c8338c68b4161346758952b8 /fs/cifs/smb2file.c | |
| parent | 7dc33e02fbdf4d19e17493ff2de87a86a4ad7699 (diff) | |
| parent | 0111d0f13469831266d716e3b50d580a3e25cff9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-android-14.09
Diffstat (limited to 'fs/cifs/smb2file.c')
| -rw-r--r-- | fs/cifs/smb2file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smb2file.c b/fs/cifs/smb2file.c index 3f17b4550831..45992944e238 100644 --- a/fs/cifs/smb2file.c +++ b/fs/cifs/smb2file.c @@ -50,7 +50,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, goto out; } - 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) { rc = -ENOMEM; |