lkml.org 
[lkml]   [2019]   [Dec]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2] btrfs: add missing check after link_free_space
Date
The return value of link_free_space is checked out-sync.
One branch of an if statement uses an extra check after
WARN_ON() but its peer branch does not. WARN_ON() does
not change the control flow, thus only using this check
might be insufficient.

Fix this by simply adding a check on ret.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
--
Changes in v2:
- Add memory free for free space entry.
---
fs/btrfs/free-space-cache.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 3283da419200..ba2e6cea5233 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -2437,6 +2437,10 @@ int btrfs_remove_free_space(struct btrfs_block_group *block_group,
if (info->bytes) {
ret = link_free_space(ctl, info);
WARN_ON(ret);
+ if (ret) {
+ kmem_cache_free(btrfs_free_space_cachep, info);
+ goto out_lock;
+ }
} else {
kmem_cache_free(btrfs_free_space_cachep, info);
}
--
2.21.0 (Apple Git-122)
\
 
 \ /
  Last update: 2019-12-09 04:42    [W:0.029 / U:2.964 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site