All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org,
	Shankara Pailoor <shankarapailoor@gmail.com>,
	Dave Kleikamp <dave.kleikamp@oracle.com>,
	Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 4.4 12/12] jfs: Fix inconsistency between memory allocation and ea_buf->max_size
Date: Tue,  7 Aug 2018 20:52:16 +0200	[thread overview]
Message-ID: <20180807172343.935735761@linuxfoundation.org> (raw)
In-Reply-To: <20180807172343.326201671@linuxfoundation.org>

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Shankara Pailoor <shankarapailoor@gmail.com>

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>

---
 fs/jfs/xattr.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -493,15 +493,17 @@ static int ea_get(struct inode *inode, s
 	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;



  parent reply	other threads:[~2018-08-07 18:56 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-07 18:52 [PATCH 4.4 00/12] 4.4.147-stable review Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 01/12] scsi: qla2xxx: Fix ISP recovery on unload Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 02/12] scsi: qla2xxx: Return error when TMF returns Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 03/12] genirq: Make force irq threading setup more robust Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 04/12] nohz: Fix local_timer_softirq_pending() Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 05/12] netlink: Do not subscribe to non-existent groups Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 06/12] netlink: Dont shift with UB on nlk->ngroups Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 07/12] netlink: Dont shift on 64 for ngroups Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 08/12] ext4: fix false negatives *and* false positives in ext4_check_descriptors() Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 09/12] ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle Greg Kroah-Hartman
2018-08-07 18:52 ` [PATCH 4.4 10/12] ring_buffer: tracing: Inherit the tracing setting to next ring buffer Greg Kroah-Hartman
2018-08-07 18:52 ` Greg Kroah-Hartman [this message]
2018-08-07 22:33 ` [PATCH 4.4 00/12] 4.4.147-stable review Nathan Chancellor
2018-08-08  2:57 ` Shuah Khan
2018-08-08  5:55 ` Naresh Kamboju
2018-08-08 15:47 ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180807172343.935735761@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=dave.kleikamp@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=shankarapailoor@gmail.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.