diff --git a/net/key/af_key.c b/net/key/af_key.c
index 0756bac62f7c042851636badf0a5e961c4e673c1..72ac2ace419de4ae2e4b70c647d8cb2c0781a149 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3518,7 +3518,7 @@ static int set_sadb_kmaddress(struct sk_buff *skb, const struct xfrm_kmaddress *
 
 static int set_ipsecrequest(struct sk_buff *skb,
                            uint8_t proto, uint8_t mode, int level,
-                           uint32_t reqid, uint8_t family,
+                           uint32_t reqid, sa_family_t family,
                            const xfrm_address_t *src, const xfrm_address_t *dst)
 {
        struct sadb_x_ipsecrequest *rq;
@@ -3583,12 +3583,17 @@ static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
 
        /* ipsecrequests */
        for (i = 0, mp = m; i < num_bundles; i++, mp++) {
-               /* old locator pair */
-               size_pol += sizeof(struct sadb_x_ipsecrequest) +
-                           pfkey_sockaddr_pair_size(mp->old_family);
-               /* new locator pair */
-               size_pol += sizeof(struct sadb_x_ipsecrequest) +
-                           pfkey_sockaddr_pair_size(mp->new_family);
+               int pair_size;
+
+               pair_size = pfkey_sockaddr_pair_size(mp->old_family);
+               if (!pair_size)
+                       return -EINVAL;
+               size_pol += sizeof(struct sadb_x_ipsecrequest) + pair_size;
+
+               pair_size = pfkey_sockaddr_pair_size(mp->new_family);
+               if (!pair_size)
+                       return -EINVAL;
+               size_pol += sizeof(struct sadb_x_ipsecrequest) + pair_size;
        }
 
        size += sizeof(struct sadb_msg) + size_pol;