diff mbox

[net-next] bridge: remove unnecessary check for vtbegin in br_fill_vlan_tinfo_range

Message ID 1486478603-38776-1-git-send-email-roopa@cumulusnetworks.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Roopa Prabhu Feb. 7, 2017, 2:43 p.m. UTC 
From: Roopa Prabhu <roopa@cumulusnetworks.com>

vtbegin should not be NULL in this function, Its already checked by the
caller.

this should silence the below smatch complaint:
  net/bridge/br_netlink_tunnel.c:144 br_fill_vlan_tinfo_range()
    error: we previously assumed 'vtbegin' could be null (see line 130)

net/bridge/br_netlink_tunnel.c
   129
   130      if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) {
                    ^^^^^^^
Check for NULL.

Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
Reported-By: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
---
 net/bridge/br_netlink_tunnel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Feb. 7, 2017, 7:14 p.m. UTC | #1 
From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Tue,  7 Feb 2017 06:43:23 -0800

> From: Roopa Prabhu <roopa@cumulusnetworks.com>
> 
> vtbegin should not be NULL in this function, Its already checked by the
> caller.
> 
> this should silence the below smatch complaint:
>   net/bridge/br_netlink_tunnel.c:144 br_fill_vlan_tinfo_range()
>     error: we previously assumed 'vtbegin' could be null (see line 130)
> 
> net/bridge/br_netlink_tunnel.c
>    129
>    130      if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) {
>                     ^^^^^^^
> Check for NULL.
> 
> Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
> Reported-By: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>

Applied.
diff mbox

Patch

diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c
index 99c6801..4c1303b 100644
--- a/net/bridge/br_netlink_tunnel.c
+++ b/net/bridge/br_netlink_tunnel.c
@@ -127,7 +127,7 @@  static int br_fill_vlan_tinfo_range(struct sk_buff *skb,
 {
 	int err;
 
-	if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) {
+	if (vtend && (vtend->vid - vtbegin->vid) > 0) {
 		/* add range to skb */
 		err = br_fill_vlan_tinfo(skb, vtbegin->vid,
 					 vtbegin->tinfo.tunnel_id,