diff mbox

[for-2.8] gluster: Fix use after free in glfs_clear_preopened()

Message ID 1479378608-11962-1-git-send-email-kwolf@redhat.com
State New
Headers show

Commit Message

Kevin Wolf Nov. 17, 2016, 10:30 a.m. UTC
This fixes a use-after-free bug introduced in commit 6349c154. We need
to use QLIST_FOREACH_SAFE() when freeing elements in the loop. Spotted
by Coverity.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/gluster.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jeff Cody Nov. 17, 2016, 11:53 a.m. UTC | #1
On Thu, Nov 17, 2016 at 11:30:08AM +0100, Kevin Wolf wrote:
> This fixes a use-after-free bug introduced in commit 6349c154. We need
> to use QLIST_FOREACH_SAFE() when freeing elements in the loop. Spotted
> by Coverity.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/gluster.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/block/gluster.c b/block/gluster.c
> index 0ce15f7..891c13b 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -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;
> -- 
> 1.8.3.1
> 

Thanks,

Applied to my block branch:

git://github.com/codyprime/qemu-kvm-jtc.git block

-Jeff
diff mbox

Patch

diff --git a/block/gluster.c b/block/gluster.c
index 0ce15f7..891c13b 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -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;