summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2005-02-24 01:34:01 +0000
committersam <sam@FreeBSD.org>2005-02-24 01:34:01 +0000
commitb76bf2322a459ecd83902b451ca1fc2633d50dd3 (patch)
treed1a8b88d221d709825e18944f477ac712a334bab /sys/net
parent506f73b1a97aa1b6e95e6adfce4bc85a9e748ff6 (diff)
downloadFreeBSD-src-b76bf2322a459ecd83902b451ca1fc2633d50dd3.zip
FreeBSD-src-b76bf2322a459ecd83902b451ca1fc2633d50dd3.tar.gz
the rt parameter to ifa_rtrequest callbacks should always be non-null;
eliminate grauitous ptr checks that follow ptr deref's Noticed by: Coverity Prevent analysis tool
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_disc.c4
-rw-r--r--sys/net/if_faith.c3
-rw-r--r--sys/net/if_loop.c3
-rw-r--r--sys/net/if_stf.c4
4 files changed, 4 insertions, 10 deletions
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index da02110..3068b44 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -202,9 +202,7 @@ static void
discrtrequest(int cmd, struct rtentry *rt, struct rt_addrinfo *info)
{
RT_LOCK_ASSERT(rt);
-
- if (rt)
- rt->rt_rmx.rmx_mtu = DSMTU;
+ rt->rt_rmx.rmx_mtu = DSMTU;
}
/*
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 726eb91..392ff0d 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -275,8 +275,7 @@ faithrtrequest(cmd, rt, info)
struct rt_addrinfo *info;
{
RT_LOCK_ASSERT(rt);
- if (rt)
- rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
+ rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
}
/*
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index c2896c4..a48ab8c 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -323,8 +323,7 @@ lortrequest(cmd, rt, info)
struct rt_addrinfo *info;
{
RT_LOCK_ASSERT(rt);
- if (rt)
- rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
+ rt->rt_rmx.rmx_mtu = rt->rt_ifp->if_mtu;
}
/*
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 36c6179..6c9c468 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -766,9 +766,7 @@ stf_rtrequest(cmd, rt, info)
struct rt_addrinfo *info;
{
RT_LOCK_ASSERT(rt);
-
- if (rt)
- rt->rt_rmx.rmx_mtu = IPV6_MMTU;
+ rt->rt_rmx.rmx_mtu = IPV6_MMTU;
}
static int
OpenPOWER on IntegriCloud