| Message ID | 20210324150950.253698-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ad248f7761eb9a3ff9ba2a8c93b548600185a938 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [next] net: bridge: Fix missing return assignment from br_vlan_replay_one call | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| 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, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Wed, Mar 24, 2021 at 03:09:50PM +0000, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The call to br_vlan_replay_one is returning an error return value but > this is not being assigned to err and the following check on err is > currently always false because err was initialized to zero. Fix this > by assigning err. > > Addresses-Coverity: ("'Constant' variable guards dead code") > Fixes: 22f67cdfae6a ("net: bridge: add helper to replay VLANs installed on port") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
On 24/03/2021 17:09, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > The call to br_vlan_replay_one is returning an error return value but > this is not being assigned to err and the following check on err is > currently always false because err was initialized to zero. Fix this > by assigning err. > > Addresses-Coverity: ("'Constant' variable guards dead code") > Fixes: 22f67cdfae6a ("net: bridge: add helper to replay VLANs installed on port") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > net/bridge/br_vlan.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c > index ca8daccff217..7422691230b1 100644 > --- a/net/bridge/br_vlan.c > +++ b/net/bridge/br_vlan.c > @@ -1815,7 +1815,7 @@ int br_vlan_replay(struct net_device *br_dev, struct net_device *dev, > if (!br_vlan_should_use(v)) > continue; > > - br_vlan_replay_one(nb, dev, &vlan, extack); > + err = br_vlan_replay_one(nb, dev, &vlan, extack); > if (err) > return err; > } > Thanks, Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Wed, 24 Mar 2021 15:09:50 +0000 you wrote: > From: Colin Ian King <colin.king@canonical.com> > > The call to br_vlan_replay_one is returning an error return value but > this is not being assigned to err and the following check on err is > currently always false because err was initialized to zero. Fix this > by assigning err. > > [...] Here is the summary with links: - [next] net: bridge: Fix missing return assignment from br_vlan_replay_one call https://git.kernel.org/netdev/net-next/c/ad248f7761eb You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index ca8daccff217..7422691230b1 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -1815,7 +1815,7 @@ int br_vlan_replay(struct net_device *br_dev, struct net_device *dev, if (!br_vlan_should_use(v)) continue; - br_vlan_replay_one(nb, dev, &vlan, extack); + err = br_vlan_replay_one(nb, dev, &vlan, extack); if (err) return err; }