2 files changed, 11 insertions, 1 deletions

diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h
index e0133c73c304..590beda78ea0 100644
--- a/include/uapi/linux/icmpv6.h
+++ b/include/uapi/linux/icmpv6.h
@@ -115,6 +115,8 @@ struct icmp6hdr {
 #define ICMPV6_NOT_NEIGHBOUR            2
 #define ICMPV6_ADDR_UNREACH             3
 #define ICMPV6_PORT_UNREACH             4
+#define ICMPV6_POLICY_FAIL              5
+#define ICMPV6_REJECT_ROUTE             6
 
 /*
  *      Codes for Time Exceeded
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index b4ff0a42b8c7..70e704d49007 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -931,6 +931,14 @@ static const struct icmp6_err {
                 .err    = ECONNREFUSED,
                 .fatal  = 1,
         },
+        {       /* POLICY_FAIL */
+                .err    = EACCES,
+                .fatal  = 1,
+        },
+        {       /* REJECT_ROUTE */
+                .err    = EACCES,
+                .fatal  = 1,
+        },
 };
 
 int icmpv6_err_convert(u8 type, u8 code, int *err)
@@ -942,7 +950,7 @@ int icmpv6_err_convert(u8 type, u8 code, int *err)
         switch (type) {
         case ICMPV6_DEST_UNREACH:
                 fatal = 1;
-                if (code <= ICMPV6_PORT_UNREACH) {
+                if (code < ARRAY_SIZE(tab_unreach)) {
                         *err  = tab_unreach[code].err;
                         fatal = tab_unreach[code].fatal;
                 }