diff options
| author | Fan Du <fan.du@windriver.com> | 2013-08-06 15:50:56 +0800 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2013-08-07 10:12:58 +0200 |
| commit | af83fde7513b6c4acd869ad4fb93893704439470 (patch) | |
| tree | 0136f252646f3dbf95fdc0001c87bd271c1bba37 /net/key | |
| parent | 0659eea912cf2ce65298784b918904ba0f91f5e1 (diff) | |
| download | linux-af83fde7513b6c4acd869ad4fb93893704439470.tar.gz linux-af83fde7513b6c4acd869ad4fb93893704439470.tar.bz2 linux-af83fde7513b6c4acd869ad4fb93893704439470.zip | |
xfrm: Remove rebundant address family checking
present_and_same_family has checked addresses family validness for both
SADB_EXT_ADDRESS_SRC and SADB_EXT_ADDRESS_DST in the beginning.
Thereafter pfkey_sadb_addr2xfrm_addr doesn't need to do the checking again.
Signed-off-by: Fan Du <fan.du@windriver.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/key')
| -rw-r--r-- | net/key/af_key.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index d49f67681823..9d585370c5b4 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1196,10 +1196,6 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net, x->props.family = pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_SRC-1], &x->props.saddr); - if (!x->props.family) { - err = -EAFNOSUPPORT; - goto out; - } pfkey_sadb_addr2xfrm_addr((struct sadb_address *) ext_hdrs[SADB_EXT_ADDRESS_DST-1], &x->id.daddr); @@ -2205,10 +2201,6 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, const struct sadb_ sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1]; xp->family = pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.saddr); - if (!xp->family) { - err = -EINVAL; - goto out; - } xp->selector.family = xp->family; xp->selector.prefixlen_s = sa->sadb_address_prefixlen; xp->selector.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto); |