3 files changed, 58 insertions, 12 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 25872747762c..9d88c3df804a 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2469,13 +2469,11 @@ static void xfrm_audit_common_policyinfo(struct xfrm_policy *xp,
                                          sel->prefixlen_d);
                 break;
         case AF_INET6:
-                audit_log_format(audit_buf, " src=" NIP6_FMT,
-                                 NIP6(*(struct in6_addr *)sel->saddr.a6));
+                audit_log_format(audit_buf, " src=%pI6", sel->saddr.a6);
                 if (sel->prefixlen_s != 128)
                         audit_log_format(audit_buf, " src_prefixlen=%d",
                                          sel->prefixlen_s);
-                audit_log_format(audit_buf, " dst=" NIP6_FMT,
-                                 NIP6(*(struct in6_addr *)sel->daddr.a6));
+                audit_log_format(audit_buf, " dst=%pI6", sel->daddr.a6);
                 if (sel->prefixlen_d != 128)
                         audit_log_format(audit_buf, " dst_prefixlen=%d",
                                          sel->prefixlen_d);
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 508337f97249..304eca4ac970 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2115,10 +2115,8 @@ static void xfrm_audit_helper_sainfo(struct xfrm_state *x,
                                  NIPQUAD(x->id.daddr.a4));
                 break;
         case AF_INET6:
-                audit_log_format(audit_buf,
-                                 " src=" NIP6_FMT " dst=" NIP6_FMT,
-                                 NIP6(*(struct in6_addr *)x->props.saddr.a6),
-                                 NIP6(*(struct in6_addr *)x->id.daddr.a6));
+                audit_log_format(audit_buf, " src=%pI6 dst=%pI6",
+                                 x->props.saddr.a6, x->id.daddr.a6);
                 break;
         }
 
@@ -2142,10 +2140,8 @@ static void xfrm_audit_helper_pktinfo(struct sk_buff *skb, u16 family,
         case AF_INET6:
                 iph6 = ipv6_hdr(skb);
                 audit_log_format(audit_buf,
-                                 " src=" NIP6_FMT " dst=" NIP6_FMT
-                                 " flowlbl=0x%x%02x%02x",
-                                 NIP6(iph6->saddr),
-                                 NIP6(iph6->daddr),
+                                 " src=%pI6 dst=%pI6 flowlbl=0x%x%02x%02x",
+                                 &iph6->saddr,&iph6->daddr,
                                  iph6->flow_lbl[0] & 0x0f,
                                  iph6->flow_lbl[1],
                                  iph6->flow_lbl[2]);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 4a8a1abb59ee..76cf56d5d834 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2503,6 +2503,57 @@ static int xfrm_send_report(u8 proto, struct xfrm_selector *sel,
         return nlmsg_multicast(xfrm_nl, skb, 0, XFRMNLGRP_REPORT, GFP_ATOMIC);
 }
 
+static inline size_t xfrm_mapping_msgsize(void)
+{
+        return NLMSG_ALIGN(sizeof(struct xfrm_user_mapping));
+}
+
+static int build_mapping(struct sk_buff *skb, struct xfrm_state *x,
+                         xfrm_address_t *new_saddr, __be16 new_sport)
+{
+        struct xfrm_user_mapping *um;
+        struct nlmsghdr *nlh;
+
+        nlh = nlmsg_put(skb, 0, 0, XFRM_MSG_MAPPING, sizeof(*um), 0);
+        if (nlh == NULL)
+                return -EMSGSIZE;
+
+        um = nlmsg_data(nlh);
+
+        memcpy(&um->id.daddr, &x->id.daddr, sizeof(um->id.daddr));
+        um->id.spi = x->id.spi;
+        um->id.family = x->props.family;
+        um->id.proto = x->id.proto;
+        memcpy(&um->new_saddr, new_saddr, sizeof(um->new_saddr));
+        memcpy(&um->old_saddr, &x->props.saddr, sizeof(um->old_saddr));
+        um->new_sport = new_sport;
+        um->old_sport = x->encap->encap_sport;
+        um->reqid = x->props.reqid;
+
+        return nlmsg_end(skb, nlh);
+}
+
+static int xfrm_send_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr,
+                             __be16 sport)
+{
+        struct sk_buff *skb;
+
+        if (x->id.proto != IPPROTO_ESP)
+                return -EINVAL;
+
+        if (!x->encap)
+                return -EINVAL;
+
+        skb = nlmsg_new(xfrm_mapping_msgsize(), GFP_ATOMIC);
+        if (skb == NULL)
+                return -ENOMEM;
+
+        if (build_mapping(skb, x, ipaddr, sport) < 0)
+                BUG();
+
+        return nlmsg_multicast(xfrm_nl, skb, 0, XFRMNLGRP_MAPPING, GFP_ATOMIC);
+}
+
 static struct xfrm_mgr netlink_mgr = {
         .id             = "netlink",
         .notify         = xfrm_send_state_notify,
@@ -2511,6 +2562,7 @@ static struct xfrm_mgr netlink_mgr = {
         .notify_policy  = xfrm_send_policy_notify,
         .report         = xfrm_send_report,
         .migrate        = xfrm_send_migrate,
+        .new_mapping    = xfrm_send_mapping,
 };
 
 static int __init xfrm_user_init(void)