Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68d31872 authored by James Lamanna's avatar James Lamanna Committed by David S. Miller
Browse files

[EBTABLES]: vfree() checking cleanups 



From: jlamanna@gmail.com

ebtables.c vfree() checking cleanups.

Signed-off by: James Lamanna <jlamanna@gmail.com>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 285b3afe

net/bridge/netfilter/ebtables.c

+7 −14
Original line number Diff line number Diff line
@@ -859,7 +859,6 @@ static int translate_table(struct ebt_replace *repl, 
		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);

				return -EINVAL;

			}
@@ -883,7 +882,6 @@ static int translate_table(struct ebt_replace *repl, 
		EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,

		   ebt_cleanup_entry, &i);

	}

	if (cl_s)

	vfree(cl_s);

	return ret;

}
@@ -1030,7 +1028,6 @@ static int do_replace(void __user *user, unsigned int len) 
	}

	vfree(table);



	if (counterstmp)

	vfree(counterstmp);

	return ret;
@@ -1040,7 +1037,6 @@ static int do_replace(void __user *user, unsigned int len) 
	EBT_ENTRY_ITERATE(newinfo->entries, newinfo->entries_size,

	   ebt_cleanup_entry, NULL);

free_counterstmp:

	if (counterstmp)

	vfree(counterstmp);

	/* can be initialized in translate_table() */

	if (newinfo->chainstack) {
@@ -1049,10 +1045,8 @@ static int do_replace(void __user *user, unsigned int len) 
		vfree(newinfo->chainstack);

	}

free_entries:

	if (newinfo->entries)

	vfree(newinfo->entries);

free_newinfo:

	if (newinfo)

	vfree(newinfo);

	return ret;

}
@@ -1213,7 +1207,6 @@ void ebt_unregister_table(struct ebt_table *table) 
	down(&ebt_mutex);

	LIST_DELETE(&ebt_tables, table);

	up(&ebt_mutex);

	if (table->private->entries)

	vfree(table->private->entries);

	if (table->private->chainstack) {

		for (i = 0; i < num_possible_cpus(); i++)