ebtables.c - vfree() checking cleanups
Subsystems (4)
PATCH 14/29 ebtables.c - vfree() checking cleanups
ebtables.c vfree() checking cleanups.
Signed-off by: James Lamanna <[email protected]>
ebtables.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-)
net/bridge/netfilter/ebtables.c +4 -8
@@ -858,8 +858,7 @@if (repl->valid_hooks & (1 << i))if (check_chainloops (newinfo->hook_entry[i], cl_s, udc_cnt, i, newinfo->entries)) { -if (cl_s) -vfree (cl_s); +vfree (cl_s);return -EINVAL ; }
@@ -882,8 +881,7 @@EBT_ENTRY_ITERATE (newinfo->entries, newinfo->entries_size, ebt_cleanup_entry, &i); } -if (cl_s) -vfree (cl_s); +vfree (cl_s);return ret; }
@@ -1029,8 +1027,7 @@ }vfree (table); -if (counterstmp) -vfree (counterstmp); +vfree (counterstmp);return ret; free_unlock:
@@ -1039,8 +1036,7 @@EBT_ENTRY_ITERATE (newinfo->entries, newinfo->entries_size, ebt_cleanup_entry,NULL ); free_counterstmp: -if (counterstmp) -vfree (counterstmp); +vfree (counterstmp);/* can be initialized in translate_table() */ if (newinfo->chainstack) { for (i @@ -1048,11 +1044,9 @@
vfree(newinfo->chainstack);
}
free_entries:
- if (newinfo->entries)
- vfree(newinfo->entries);
+ vfree(newinfo->entries);
free_newinfo:
- if (newinfo)
- vfree(newinfo);
+ vfree(newinfo);
return ret;
}
@@ -1212,8 +1206,7 @@
down(&ebt_mutex);
LIST_DELETE(&ebt_tables, table);
up(&ebt_mutex);
- if (table->private->entries)
- vfree(table->private->entries);
+ vfree(table->private->entries);
if (table->private->chainstack) {
for (i vfree(table->private->chainstack[i]);
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors