1 files changed, 21 insertions, 5 deletions

diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index 6cc9f6e2dd2b..3c642328a117 100644
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -300,16 +300,22 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
                         if (mtu < IPV6_MIN_MTU)
                                 mtu = IPV6_MIN_MTU;
 
-                        icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
+                        if (skb->len > 1280)
+                                icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);
+                        else
+                                goto xmit;
                 } else {
-                        icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
-                                  htonl(mtu));
+                        if (!(ip_hdr(skb)->frag_off & htons(IP_DF)))
+                                goto xmit;
+                        icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
+                                      htonl(mtu));
                 }
 
                 dst_release(dst);
                 return -EMSGSIZE;
         }
 
+xmit:
         xfrmi_scrub_packet(skb, !net_eq(xi->net, dev_net(dev)));
         skb_dst_set(skb, dst);
         skb->dev = tdev;
@@ -659,11 +665,16 @@ static int xfrmi_newlink(struct net *src_net, struct net_device *dev,
                         struct netlink_ext_ack *extack)
 {
         struct net *net = dev_net(dev);
-        struct xfrm_if_parms p;
+        struct xfrm_if_parms p = {};
         struct xfrm_if *xi;
         int err;
 
         xfrmi_netlink_parms(data, &p);
+        if (!p.if_id) {
+                NL_SET_ERR_MSG(extack, "if_id must be non zero");
+                return -EINVAL;
+        }
+
         xi = xfrmi_locate(net, &p);
         if (xi)
                 return -EEXIST;
@@ -688,9 +699,14 @@ static int xfrmi_changelink(struct net_device *dev, struct nlattr *tb[],
 {
         struct xfrm_if *xi = netdev_priv(dev);
         struct net *net = xi->net;
-        struct xfrm_if_parms p;
+        struct xfrm_if_parms p = {};
 
         xfrmi_netlink_parms(data, &p);
+        if (!p.if_id) {
+                NL_SET_ERR_MSG(extack, "if_id must be non zero");
+                return -EINVAL;
+        }
+
         xi = xfrmi_locate(net, &p);
         if (!xi) {
                 xi = netdev_priv(dev);