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

Commit 1a28ad74 authored by Gao Feng's avatar Gao Feng Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: eliminate useless condition checks 



The return value of nf_tables_table_lookup() is valid pointer or one
pointer error. There are two cases:

1) IS_ERR(table) is true, it would return the error or reset the
   table as NULL, it is unnecessary to perform the latter check
   "table != NULL".

2) IS_ERR(obj) is false, the table is one valid pointer. It is also
   unnecessary to perform that check.

The nf_tables_newset() and nf_tables_newobj() have same logic codes.

In summary, we could move the block of condition check "table != NULL"
in the else block to eliminate the original condition checks.

Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent f169fd69

net/netfilter/nf_tables_api.c

+3 −12
Original line number Diff line number Diff line
@@ -696,10 +696,7 @@ static int nf_tables_newtable(struct net *net, struct sock *nlsk, 
	if (IS_ERR(table)) {

		if (PTR_ERR(table) != -ENOENT)

			return PTR_ERR(table);

		table = NULL;

	}



	if (table != NULL) {

	} else {

		if (nlh->nlmsg_flags & NLM_F_EXCL)

			return -EEXIST;

		if (nlh->nlmsg_flags & NLM_F_REPLACE)
@@ -2963,10 +2960,7 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk, 
	if (IS_ERR(set)) {

		if (PTR_ERR(set) != -ENOENT)

			return PTR_ERR(set);

		set = NULL;

	}



	if (set != NULL) {

	} else {

		if (nlh->nlmsg_flags & NLM_F_EXCL)

			return -EEXIST;

		if (nlh->nlmsg_flags & NLM_F_REPLACE)
@@ -4153,10 +4147,7 @@ static int nf_tables_newobj(struct net *net, struct sock *nlsk, 
		if (err != -ENOENT)

			return err;



		obj = NULL;

	}



	if (obj != NULL) {

	} else {

		if (nlh->nlmsg_flags & NLM_F_EXCL)

			return -EEXIST;