netfilter: nf_tables: fix update chain error

ppiao · ummakynes · commit 0d18779be137 · 2017-09-29T13:34:36.000+02:00
# nft add table filter # nft add chain filter c1 # nft rename chain filter c1 c2 Error: Could not process rule: No such file or directory rename chain filter c1 c2 ^^^^^^^^^^^^^^^^^^^^^^^^^^ # nft add chain filter c2 # nft rename chain filter c1 c2 # nft list table filter table ip filter { chain c2 { } chain c2 { } } Fixes: 664b0f8 ("netfilter: nf_tables: add generation mask to chains") Signed-off-by: JingPiao Chen <chenjingpiao@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
@@ -1487,8 +1487,8 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,
 
 		chain2 = nf_tables_chain_lookup(table, nla[NFTA_CHAIN_NAME],
 						genmask);
-		if (IS_ERR(chain2))
-			return PTR_ERR(chain2);
+		if (!IS_ERR(chain2))
+			return -EEXIST;
 	}
 
 	if (nla[NFTA_CHAIN_COUNTERS]) {

Original file line number	Diff line number	Diff line change
`@@ -1487,8 +1487,8 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,`
`1487`	`1487`
`1488`	`1488`	`chain2 = nf_tables_chain_lookup(table, nla[NFTA_CHAIN_NAME],`
`1489`	`1489`	`genmask);`
`1490`		`- if (IS_ERR(chain2))`
`1491`		`- return PTR_ERR(chain2);`
	`1490`	`+ if (!IS_ERR(chain2))`
	`1491`	`+ return -EEXIST;`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`	`1494`	`if (nla[NFTA_CHAIN_COUNTERS]) {`