* [patch] btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
@ 2015-06-24 14:32 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2015-06-24 14:32 UTC (permalink / raw)
To: Chris Mason, Qu Wenruo
Cc: Josef Bacik, David Sterba, linux-btrfs, kernel-janitors
There is a cut and paste error so instead of freeing "head_ref", we free
"ref" twice.
Fixes: 3368d001ba5d ('btrfs: qgroup: Record possible quota-related extent for qgroup.')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index fd64fd0..ac3e81d 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -650,18 +650,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
return -ENOMEM;
head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);
- if (!head_ref) {
- kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
- return -ENOMEM;
- }
+ if (!head_ref)
+ goto free_ref;
if (fs_info->quota_enabled && is_fstree(ref_root)) {
record = kmalloc(sizeof(*record), GFP_NOFS);
- if (!record) {
- kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
- kmem_cache_free(btrfs_delayed_ref_head_cachep, ref);
- return -ENOMEM;
- }
+ if (!record)
+ goto free_head_ref;
}
head_ref->extent_op = extent_op;
@@ -682,6 +677,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
spin_unlock(&delayed_refs->lock);
return 0;
+
+free_head_ref:
+ kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);
+free_ref:
+ kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
+
+ return -ENOMEM;
}
/*
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [patch] btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
@ 2015-06-24 14:32 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2015-06-24 14:32 UTC (permalink / raw)
To: Chris Mason, Qu Wenruo
Cc: Josef Bacik, David Sterba, linux-btrfs, kernel-janitors
There is a cut and paste error so instead of freeing "head_ref", we free
"ref" twice.
Fixes: 3368d001ba5d ('btrfs: qgroup: Record possible quota-related extent for qgroup.')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index fd64fd0..ac3e81d 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -650,18 +650,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
return -ENOMEM;
head_ref = kmem_cache_alloc(btrfs_delayed_ref_head_cachep, GFP_NOFS);
- if (!head_ref) {
- kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
- return -ENOMEM;
- }
+ if (!head_ref)
+ goto free_ref;
if (fs_info->quota_enabled && is_fstree(ref_root)) {
record = kmalloc(sizeof(*record), GFP_NOFS);
- if (!record) {
- kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
- kmem_cache_free(btrfs_delayed_ref_head_cachep, ref);
- return -ENOMEM;
- }
+ if (!record)
+ goto free_head_ref;
}
head_ref->extent_op = extent_op;
@@ -682,6 +677,13 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
spin_unlock(&delayed_refs->lock);
return 0;
+
+free_head_ref:
+ kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);
+free_ref:
+ kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
+
+ return -ENOMEM;
}
/*
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch] btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
2015-06-24 14:32 ` Dan Carpenter
@ 2015-06-24 19:26 ` Chris Mason
-1 siblings, 0 replies; 4+ messages in thread
From: Chris Mason @ 2015-06-24 19:26 UTC (permalink / raw)
To: Dan Carpenter
Cc: Qu Wenruo, Josef Bacik, David Sterba, linux-btrfs, kernel-janitors
On Wed, Jun 24, 2015 at 05:32:33PM +0300, Dan Carpenter wrote:
> There is a cut and paste error so instead of freeing "head_ref", we free
> "ref" twice.
>
> Fixes: 3368d001ba5d ('btrfs: qgroup: Record possible quota-related extent for qgroup.')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks Dan! Queued.
-chris
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()
@ 2015-06-24 19:26 ` Chris Mason
0 siblings, 0 replies; 4+ messages in thread
From: Chris Mason @ 2015-06-24 19:26 UTC (permalink / raw)
To: Dan Carpenter
Cc: Qu Wenruo, Josef Bacik, David Sterba, linux-btrfs, kernel-janitors
On Wed, Jun 24, 2015 at 05:32:33PM +0300, Dan Carpenter wrote:
> There is a cut and paste error so instead of freeing "head_ref", we free
> "ref" twice.
>
> Fixes: 3368d001ba5d ('btrfs: qgroup: Record possible quota-related extent for qgroup.')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks Dan! Queued.
-chris
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-24 19:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-24 14:32 [patch] btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref() Dan Carpenter
2015-06-24 14:32 ` Dan Carpenter
2015-06-24 19:26 ` Chris Mason
2015-06-24 19:26 ` Chris Mason
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.