netfilter: conntrack: Convert to use ERR_CAST()

[PATCH v1] netfilter: conntrack: Convert to use ERR_CAST()

Shen Lichuan posted 1 patch 1 year, 3 months ago

Download mbox

net/netfilter/nf_conntrack_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH v1] netfilter: conntrack: Convert to use ERR_CAST()

Posted by Shen Lichuan 1 year, 3 months ago

Use the ERR_CAST macro to clearly indicate that this is a pointer 
to an error value and that a type conversion was performed.

Signed-off-by: Shen Lichuan <shenlichuan@vivo.com>
---
 net/netfilter/nf_conntrack_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 9384426ddc06..d3cb53b008f5 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1722,7 +1722,7 @@ init_conntrack(struct net *net, struct nf_conn *tmpl,
 	ct = __nf_conntrack_alloc(net, zone, tuple, &repl_tuple, GFP_ATOMIC,
 				  hash);
 	if (IS_ERR(ct))
-		return (struct nf_conntrack_tuple_hash *)ct;
+		return ERR_CAST(ct);
 
 	if (!nf_ct_add_synproxy(ct, tmpl)) {
 		nf_conntrack_free(ct);
-- 
2.17.1

Re: [PATCH v1] netfilter: conntrack: Convert to use ERR_CAST()

Posted by Pablo Neira Ayuso 1 year, 3 months ago

On Wed, Aug 28, 2024 at 07:06:51PM +0800, Shen Lichuan wrote:
> Use the ERR_CAST macro to clearly indicate that this is a pointer 
> to an error value and that a type conversion was performed.

Applied, thanks