linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: jmorris@namei.org
Cc: Andreea-Cristina Bernat <bernat.ada@gmail.com>,
	keyrings@linux-nfs.org, shemming@brocade.com,
	linux-kernel@vger.kernel.org, dhowells@redhat.com,
	linux-security-module@vger.kernel.org,
	paulmck@linux.vnet.ibm.com
Subject: [PATCH 4/5] KEYS: Fix use-after-free in assoc_array_gc()
Date: Tue, 02 Sep 2014 13:52:20 +0100	[thread overview]
Message-ID: <20140902125220.9247.32762.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20140902125159.9247.11970.stgit@warthog.procyon.org.uk>

An edit script should be considered inaccessible by a function once it has
called assoc_array_apply_edit() or assoc_array_cancel_edit().

However, assoc_array_gc() is accessing the edit script just after the
gc_complete: label.

Reported-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Andreea-Cristina Bernat <bernat.ada@gmail.com>
cc: shemming@brocade.com
cc: paulmck@linux.vnet.ibm.com
---

 lib/assoc_array.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/assoc_array.c b/lib/assoc_array.c
index c0b1007011e1..ae146f0734eb 100644
--- a/lib/assoc_array.c
+++ b/lib/assoc_array.c
@@ -1735,7 +1735,7 @@ ascend_old_tree:
 gc_complete:
 	edit->set[0].to = new_root;
 	assoc_array_apply_edit(edit);
-	edit->array->nr_leaves_on_tree = nr_leaves_on_tree;
+	array->nr_leaves_on_tree = nr_leaves_on_tree;
 	return 0;
 
 enomem:


  parent reply	other threads:[~2014-09-02 12:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-02 12:52 [PATCH 0/5] KEYS: Miscellaneous fixes David Howells
2014-09-02 12:52 ` [PATCH 1/5] KEYS: Increase root_maxkeys and root_maxbytes sizes David Howells
2014-09-02 12:52 ` [PATCH 2/5] KEYS: Fix public_key asymmetric key subtype name David Howells
2014-09-02 12:52 ` [PATCH 3/5] KEYS: Set pr_fmt() in asymmetric key signature handling David Howells
2014-09-02 12:52 ` David Howells [this message]
2014-09-02 12:52 ` [PATCH 5/5] PEFILE: Relax the check on the length of the PKCS#7 cert David Howells
2014-09-02 14:56 ` [PATCH 0/5] KEYS: Miscellaneous fixes James Morris
2014-09-02 18:07 ` David Howells
2014-09-03  0:55   ` James Morris

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=20140902125220.9247.32762.stgit@warthog.procyon.org.uk \
    --to=dhowells@redhat.com \
    --cc=bernat.ada@gmail.com \
    --cc=jmorris@namei.org \
    --cc=keyrings@linux-nfs.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=shemming@brocade.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).