diff options
| author | Shankara Pailoor <shankarapailoor@gmail.com> | 2018-06-05 08:33:27 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-09 12:15:13 +0200 |
| commit | 2972e3f6816c7dc0d4804ae82a3d02ffb94068dc (patch) | |
| tree | d9a9a36294788290eabb0c1294247340757933f9 | |
| parent | 39dc3fb32fd4bf0fde9e8c971dec8228722f0a70 (diff) | |
| download | linux-stable-2972e3f6816c7dc0d4804ae82a3d02ffb94068dc.tar.gz linux-stable-2972e3f6816c7dc0d4804ae82a3d02ffb94068dc.tar.bz2 linux-stable-2972e3f6816c7dc0d4804ae82a3d02ffb94068dc.zip | |
jfs: Fix inconsistency between memory allocation and ea_buf->max_size
commit 92d34134193e5b129dc24f8d79cb9196626e8d7a upstream.
The code is assuming the buffer is max_size length, but we weren't
allocating enough space for it.
Signed-off-by: Shankara Pailoor <shankarapailoor@gmail.com>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/jfs/xattr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c index c60f3d32ee91..a6797986b625 100644 --- a/fs/jfs/xattr.c +++ b/fs/jfs/xattr.c @@ -491,15 +491,17 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size) if (size > PSIZE) { /* * To keep the rest of the code simple. Allocate a - * contiguous buffer to work with + * contiguous buffer to work with. Make the buffer large + * enough to make use of the whole extent. */ - ea_buf->xattr = kmalloc(size, GFP_KERNEL); + ea_buf->max_size = (size + sb->s_blocksize - 1) & + ~(sb->s_blocksize - 1); + + ea_buf->xattr = kmalloc(ea_buf->max_size, GFP_KERNEL); if (ea_buf->xattr == NULL) return -ENOMEM; ea_buf->flag = EA_MALLOC; - ea_buf->max_size = (size + sb->s_blocksize - 1) & - ~(sb->s_blocksize - 1); if (ea_size == 0) return 0; |