diff options
| author |   Roopa Prabhu <roopa@cumulusnetworks.com> | 2017-02-07 06:43:23 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-02-07 14:14:12 -0500 |
| commit | a8cab863a75f2d353588d4c3c37dc37c77b96c83 (patch) | |
| tree | a2b14db32bd6ddd64a08aaa82a4c8188dd5b8861 /net/bridge | |
| parent | sctp: drop __packed from almost all SCTP structures (diff) | |
| download | linux-dev-a8cab863a75f2d353588d4c3c37dc37c77b96c83.tar.xz linux-dev-a8cab863a75f2d353588d4c3c37dc37c77b96c83.zip | |
bridge: remove unnecessary check for vtbegin in br_fill_vlan_tinfo_range
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netlink_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netlink_tunnel.c b/net/bridge/br_netlink_tunnel.c index 62eaf750bd9e..f38473509647 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, |