| Message ID | 20240829095509.3151987-1-yanzhen@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b26b64493343659cce8bbffa358bf39e4f68bdec |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v1,net-next] net: openvswitch: Use ERR_CAST() to return | expand |
On 29 Aug 2024, at 11:55, Yan Zhen wrote: > Using ERR_CAST() is more reasonable and safer, When it is necessary > to convert the type of an error pointer and return it. > > Signed-off-by: Yan Zhen <yanzhen@vivo.com> > --- > net/openvswitch/flow_netlink.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c > index c92bdc4dfe19..729ef582a3a8 100644 > --- a/net/openvswitch/flow_netlink.c > +++ b/net/openvswitch/flow_netlink.c > @@ -2491,7 +2491,7 @@ static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa, > > acts = nla_alloc_flow_actions(new_acts_size); > if (IS_ERR(acts)) > - return (void *)acts; > + return ERR_CAST(acts); Change looks good to me. Acked-by: Eelco Chaudron <echaudro@redhat.com> > memcpy(acts->actions, (*sfa)->actions, (*sfa)->actions_len); > acts->actions_len = (*sfa)->actions_len; > -- > 2.34.1
Yan Zhen <yanzhen@vivo.com> writes: > Using ERR_CAST() is more reasonable and safer, When it is necessary > to convert the type of an error pointer and return it. > > Signed-off-by: Yan Zhen <yanzhen@vivo.com> > --- LGTM, and seems like the only remaining place where we are open coding the error return conversion in the OVS module (at least, where we do a check with IS_ERR). At least, I tried to visit them all while looking at this. Reviewed-by: Aaron Conole <aconole@redhat.com> > net/openvswitch/flow_netlink.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c > index c92bdc4dfe19..729ef582a3a8 100644 > --- a/net/openvswitch/flow_netlink.c > +++ b/net/openvswitch/flow_netlink.c > @@ -2491,7 +2491,7 @@ static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa, > > acts = nla_alloc_flow_actions(new_acts_size); > if (IS_ERR(acts)) > - return (void *)acts; > + return ERR_CAST(acts); > > memcpy(acts->actions, (*sfa)->actions, (*sfa)->actions_len); > acts->actions_len = (*sfa)->actions_len; > -- > 2.34.1
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Thu, 29 Aug 2024 17:55:09 +0800 you wrote: > Using ERR_CAST() is more reasonable and safer, When it is necessary > to convert the type of an error pointer and return it. > > Signed-off-by: Yan Zhen <yanzhen@vivo.com> > --- > net/openvswitch/flow_netlink.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [v1,net-next] net: openvswitch: Use ERR_CAST() to return https://git.kernel.org/netdev/net-next/c/b26b64493343 You are awesome, thank you!
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index c92bdc4dfe19..729ef582a3a8 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -2491,7 +2491,7 @@ static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa, acts = nla_alloc_flow_actions(new_acts_size); if (IS_ERR(acts)) - return (void *)acts; + return ERR_CAST(acts); memcpy(acts->actions, (*sfa)->actions, (*sfa)->actions_len); acts->actions_len = (*sfa)->actions_len;
Using ERR_CAST() is more reasonable and safer, When it is necessary to convert the type of an error pointer and return it. Signed-off-by: Yan Zhen <yanzhen@vivo.com> --- net/openvswitch/flow_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)