| Message ID | 20210315144323.4110640-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6f0d32509a92d656d9394788436792d863dff5da |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dsa: sja1105: fix error return code in sja1105_cls_flower_add() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | fail | 3 blamed authors not CCed: davem@davemloft.net simon.horman@netronome.com louis.peens@netronome.com; 3 maintainers not CCed: davem@davemloft.net simon.horman@netronome.com louis.peens@netronome.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 15 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Mon, Mar 15, 2021 at 02:43:23PM +0000, 'w00385741 wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > The return value 'rc' maybe overwrite to 0 in the flow_action_for_each > loop, the error code from the offload not support error handling will > not set. This commit fix it to return -EOPNOTSUPP. > > Fixes: 6a56e19902af ("flow_offload: reject configuration of packet-per-second policing in offload drivers") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- Thank you for the patch, Yongjun. Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
On Mon, Mar 15, 2021 at 02:43:23PM +0000, 'w00385741 wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > The return value 'rc' maybe overwrite to 0 in the flow_action_for_each > loop, the error code from the offload not support error handling will > not set. This commit fix it to return -EOPNOTSUPP. > > Fixes: 6a56e19902af ("flow_offload: reject configuration of packet-per-second policing in offload drivers") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/net/dsa/sja1105/sja1105_flower.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/dsa/sja1105/sja1105_flower.c b/drivers/net/dsa/sja1105/sja1105_flower.c > index f78b767f86ee..973761132fc3 100644 > --- a/drivers/net/dsa/sja1105/sja1105_flower.c > +++ b/drivers/net/dsa/sja1105/sja1105_flower.c > @@ -317,14 +317,13 @@ int sja1105_cls_flower_add(struct dsa_switch *ds, int port, > if (rc) > return rc; > > - rc = -EOPNOTSUPP; > - > flow_action_for_each(i, act, &rule->action) { > switch (act->id) { > case FLOW_ACTION_POLICE: > if (act->police.rate_pkt_ps) { > NL_SET_ERR_MSG_MOD(extack, > "QoS offload not support packets per second"); > + rc = -EOPNOTSUPP; > goto out; Yep. The goto out is a do nothing goto and "forgot the error code" is the traditional bug introduced by do nothing gotos. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> regards, dan carpenter
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Mon, 15 Mar 2021 14:43:23 +0000 you wrote: > From: Wei Yongjun <weiyongjun1@huawei.com> > > The return value 'rc' maybe overwrite to 0 in the flow_action_for_each > loop, the error code from the offload not support error handling will > not set. This commit fix it to return -EOPNOTSUPP. > > Fixes: 6a56e19902af ("flow_offload: reject configuration of packet-per-second policing in offload drivers") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > > [...] Here is the summary with links: - [net-next] net: dsa: sja1105: fix error return code in sja1105_cls_flower_add() https://git.kernel.org/netdev/net-next/c/6f0d32509a92 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/dsa/sja1105/sja1105_flower.c b/drivers/net/dsa/sja1105/sja1105_flower.c index f78b767f86ee..973761132fc3 100644 --- a/drivers/net/dsa/sja1105/sja1105_flower.c +++ b/drivers/net/dsa/sja1105/sja1105_flower.c @@ -317,14 +317,13 @@ int sja1105_cls_flower_add(struct dsa_switch *ds, int port, if (rc) return rc; - rc = -EOPNOTSUPP; - flow_action_for_each(i, act, &rule->action) { switch (act->id) { case FLOW_ACTION_POLICE: if (act->police.rate_pkt_ps) { NL_SET_ERR_MSG_MOD(extack, "QoS offload not support packets per second"); + rc = -EOPNOTSUPP; goto out; }