Commit 06bf33cf authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging 



# gpg: Signature made Mon 21 Nov 2016 10:12:43 PM GMT
# gpg:                using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* jtc/tags/block-pull-request:
  gluster: Fix use after free in glfs_clear_preopened()

Message-id: 1479766499-29972-1-git-send-email-jcody@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents ab9125c0 668c0e44

block/gluster.c

+2 −1
Original line number Diff line number Diff line
@@ -239,12 +239,13 @@ static glfs_t *glfs_find_preopened(const char *volume) 
static void glfs_clear_preopened(glfs_t *fs)

{

    ListElement *entry = NULL;

    ListElement *next;



    if (fs == NULL) {

        return;

    }



    QLIST_FOREACH(entry, &glfs_list, list) {

    QLIST_FOREACH_SAFE(entry, &glfs_list, list, next) {

        if (entry->saved.fs == fs) {

            if (--entry->saved.ref) {

                return;