Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b083916638eee513be501f53b42a4be0b9851db0

Authored by Julia Lawall
Committed by Chris Mason
1 parent 37daa4f968
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

fs/btrfs: Add missing btrfs_free_path 

Btrfs_alloc_path should be matched with btrfs_free_path in error-handling code.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
local idexpression struct btrfs_path * x;
expression ra,rb;
position p1,p2;
@@

x = btrfs_alloc_path@p1(...)
...  when != btrfs_free_path(x,...)
     when != if (...) { ... btrfs_free_path(x,...) ...}
     when != x = ra
if(...) { ... when != x = rb
     when forall
     when != btrfs_free_path(x,...)
 \(return <+...x...+>; \| return@p2...; \) }

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

cocci.print_main("alloc",p1)
cocci.print_secs("return",p2)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

Showing 2 changed files with 4 additions and 1 deletions Side-by-side Diff

... ... @@ -7314,6 +7314,7 @@
7314 7314 datasize);
7315 7315 if (err) {
7316 7316 drop_inode = 1;
  7317 + btrfs_free_path(path);
7317 7318 goto out_unlock;
7318 7319 }
7319 7320 leaf = path->nodes[0];
... ... @@ -506,8 +506,10 @@
506 506 */
507 507 dir_id = btrfs_super_root_dir(&root->fs_info->super_copy);
508 508 di = btrfs_lookup_dir_item(NULL, root, path, dir_id, "default", 7, 0);
509   - if (IS_ERR(di))
  509 + if (IS_ERR(di)) {
  510 + btrfs_free_path(path);
510 511 return ERR_CAST(di);
  512 + }
511 513 if (!di) {
512 514 /*
513 515 * Ok the default dir item isn't there. This is weird since