9 files changed, 199 insertions, 163 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 85cf7ea978aa..fd4118e097f0 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -64,6 +64,8 @@ config CRC7
 
 config LIBCRC32C
         tristate "CRC32c (Castagnoli, et al) Cyclic Redundancy-Check"
+        select CRYPTO
+        select CRYPTO_CRC32C
         help
           This option is provided for the case where no in-kernel-tree
           modules require CRC32c functions, but a module built outside the
diff --git a/lib/Makefile b/lib/Makefile
index 7cb65d85aeb0..80fe8a3ec12a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
          rbtree.o radix-tree.o dump_stack.o \
          idr.o int_sqrt.o extable.o prio_tree.o \
          sha1.o irq_regs.o reciprocal_div.o argv_split.o \
-         proportions.o prio_heap.o ratelimit.o show_mem.o
+         proportions.o prio_heap.o ratelimit.o show_mem.o is_single_threaded.o
 
 lib-$(CONFIG_MMU) += ioremap.o
 lib-$(CONFIG_SMP) += cpumask.o
diff --git a/lib/bug.c b/lib/bug.c
index bfeafd60ee9f..300e41afbf97 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -5,6 +5,8 @@
 
   CONFIG_BUG - emit BUG traps.  Nothing happens without this.
   CONFIG_GENERIC_BUG - enable this code.
+  CONFIG_GENERIC_BUG_RELATIVE_POINTERS - use 32-bit pointers relative to
+        the containing struct bug_entry for bug_addr and file.
   CONFIG_DEBUG_BUGVERBOSE - emit full file+line information for each BUG
 
   CONFIG_BUG and CONFIG_DEBUG_BUGVERBOSE are potentially user-settable
@@ -43,6 +45,15 @@
 
 extern const struct bug_entry __start___bug_table[], __stop___bug_table[];
 
+static inline unsigned long bug_addr(const struct bug_entry *bug)
+{
+#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
+        return bug->bug_addr;
+#else
+        return (unsigned long)bug + bug->bug_addr_disp;
+#endif
+}
+
 #ifdef CONFIG_MODULES
 static LIST_HEAD(module_bug_list);
 
@@ -55,7 +66,7 @@ static const struct bug_entry *module_find_bug(unsigned long bugaddr)
                 unsigned i;
 
                 for (i = 0; i < mod->num_bugs; ++i, ++bug)
-                        if (bugaddr == bug->bug_addr)
+                        if (bugaddr == bug_addr(bug))
                                 return bug;
         }
         return NULL;
@@ -108,7 +119,7 @@ const struct bug_entry *find_bug(unsigned long bugaddr)
         const struct bug_entry *bug;
 
         for (bug = __start___bug_table; bug < __stop___bug_table; ++bug)
-                if (bugaddr == bug->bug_addr)
+                if (bugaddr == bug_addr(bug))
                         return bug;
 
         return module_find_bug(bugaddr);
@@ -133,7 +144,11 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
         if (bug) {
 #ifdef CONFIG_DEBUG_BUGVERBOSE
+#ifndef CONFIG_GENERIC_BUG_RELATIVE_POINTERS
                 file = bug->file;
+#else
+                file = (const char *)bug + bug->file_disp;
+#endif
                 line = bug->line;
 #endif
                 warning = (bug->flags & BUGFLAG_WARNING) != 0;
diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c
index d83660fd6fdd..8e30295e8566 100644
--- a/lib/dynamic_printk.c
+++ b/lib/dynamic_printk.c
@@ -135,7 +135,7 @@ int unregister_dynamic_debug_module(char *mod_name)
         nr_entries--;
 out:
         up(&debug_list_mutex);
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
 
@@ -289,7 +289,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
                                         dynamic_enabled = DYNAMIC_ENABLED_SOME;
                                         err = 0;
                                         printk(KERN_DEBUG
-                                               "debugging enabled for module %s",
+                                               "debugging enabled for module %s\n",
                                                elem->name);
                                 } else if (!value && (elem->enable == 1)) {
                                         elem->enable = 0;
@@ -309,7 +309,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
                                         err = 0;
                                         printk(KERN_DEBUG
                                                "debugging disabled for module "
-                                               "%s", elem->name);
+                                               "%s\n", elem->name);
                                 }
                         }
                 }
diff --git a/lib/idr.c b/lib/idr.c
index e728c7fccc4d..1c4f9281f412 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -185,6 +185,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
                         new = get_from_free_list(idp);
                         if (!new)
                                 return -1;
+                        new->layer = l-1;
                         rcu_assign_pointer(p->ary[m], new);
                         p->count++;
                 }
@@ -210,6 +211,7 @@ build_up:
         if (unlikely(!p)) {
                 if (!(p = get_from_free_list(idp)))
                         return -1;
+                p->layer = 0;
                 layers = 1;
         }
         /*
@@ -218,8 +220,14 @@ build_up:
          */
         while ((layers < (MAX_LEVEL - 1)) && (id >= (1 << (layers*IDR_BITS)))) {
                 layers++;
-                if (!p->count)
+                if (!p->count) {
+                        /* special case: if the tree is currently empty,
+                         * then we grow the tree by moving the top node
+                         * upwards.
+                         */
+                        p->layer++;
                         continue;
+                }
                 if (!(new = get_from_free_list(idp))) {
                         /*
                          * The allocation failed.  If we built part of
@@ -237,6 +245,7 @@ build_up:
                 }
                 new->ary[0] = p;
                 new->count = 1;
+                new->layer = layers-1;
                 if (p->bitmap == IDR_FULL)
                         __set_bit(0, &new->bitmap);
                 p = new;
@@ -493,17 +502,21 @@ void *idr_find(struct idr *idp, int id)
         int n;
         struct idr_layer *p;
 
-        n = idp->layers * IDR_BITS;
         p = rcu_dereference(idp->top);
+        if (!p)
+                return NULL;
+        n = (p->layer+1) * IDR_BITS;
 
         /* Mask off upper bits we don't use for the search. */
         id &= MAX_ID_MASK;
 
         if (id >= (1 << n))
                 return NULL;
+        BUG_ON(n == 0);
 
         while (n > 0 && p) {
                 n -= IDR_BITS;
+                BUG_ON(n != p->layer*IDR_BITS);
                 p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]);
         }
         return((void *)p);
@@ -582,8 +595,11 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
         int n;
         struct idr_layer *p, *old_p;
 
-        n = idp->layers * IDR_BITS;
         p = idp->top;
+        if (!p)
+                return ERR_PTR(-EINVAL);
+
+        n = (p->layer+1) * IDR_BITS;
 
         id &= MAX_ID_MASK;
 
diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
new file mode 100644
index 000000000000..f1ed2fe76c65
--- /dev/null
+++ b/lib/is_single_threaded.c
@@ -0,0 +1,45 @@
+/* Function to determine if a thread group is single threaded or not
+ *
+ * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ * - Derived from security/selinux/hooks.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#include <linux/sched.h>
+
+/**
+ * is_single_threaded - Determine if a thread group is single-threaded or not
+ * @p: A task in the thread group in question
+ *
+ * This returns true if the thread group to which a task belongs is single
+ * threaded, false if it is not.
+ */
+bool is_single_threaded(struct task_struct *p)
+{
+        struct task_struct *g, *t;
+        struct mm_struct *mm = p->mm;
+
+        if (atomic_read(&p->signal->count) != 1)
+                goto no;
+
+        if (atomic_read(&p->mm->mm_users) != 1) {
+                read_lock(&tasklist_lock);
+                do_each_thread(g, t) {
+                        if (t->mm == mm && t != p)
+                                goto no_unlock;
+                } while_each_thread(g, t);
+                read_unlock(&tasklist_lock);
+        }
+
+        return true;
+
+no_unlock:
+        read_unlock(&tasklist_lock);
+no:
+        return false;
+}
diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c
index b5c3287d8ea4..244f5480c898 100644
--- a/lib/libcrc32c.c
+++ b/lib/libcrc32c.c
@@ -30,168 +30,52 @@
  * any later version.
  *
  */
-#include <linux/crc32c.h>
-#include <linux/compiler.h>
-#include <linux/module.h>
-
-MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
-MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations");
-MODULE_LICENSE("GPL");
 
-#define CRC32C_POLY_BE 0x1EDC6F41
-#define CRC32C_POLY_LE 0x82F63B78
+#include <crypto/hash.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 
-#ifndef CRC_LE_BITS 
-# define CRC_LE_BITS 8
-#endif
+static struct crypto_shash *tfm;
 
+u32 crc32c(u32 crc, const void *address, unsigned int length)
+{
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(tfm)];
+        } desc;
+        int err;
 
-/*
- * Haven't generated a big-endian table yet, but the bit-wise version
- * should at least work.
- */
-#if defined CRC_BE_BITS && CRC_BE_BITS != 1
-#undef CRC_BE_BITS
-#endif
-#ifndef CRC_BE_BITS
-# define CRC_BE_BITS 1
-#endif
+        desc.shash.tfm = tfm;
+        desc.shash.flags = 0;
+        *(u32 *)desc.ctx = crc;
 
-EXPORT_SYMBOL(crc32c_le);
+        err = crypto_shash_update(&desc.shash, address, length);
+        BUG_ON(err);
 
-#if CRC_LE_BITS == 1
-/*
- * Compute things bit-wise, as done in crc32.c.  We could share the tight 
- * loop below with crc32 and vary the POLY if we don't find value in terms
- * of space and maintainability in keeping the two modules separate.
- */
-u32 __pure
-crc32c_le(u32 crc, unsigned char const *p, size_t len)
-{
-        int i;
-        while (len--) {
-                crc ^= *p++;
-                for (i = 0; i < 8; i++)
-                        crc = (crc >> 1) ^ ((crc & 1) ? CRC32C_POLY_LE : 0);
-        }
-        return crc;
+        return *(u32 *)desc.ctx;
 }
-#else
-
-/*
- * This is the CRC-32C table
- * Generated with:
- * width = 32 bits
- * poly = 0x1EDC6F41
- * reflect input bytes = true
- * reflect output bytes = true
- */
-
-static const u32 crc32c_table[256] = {
-        0x00000000L, 0xF26B8303L, 0xE13B70F7L, 0x1350F3F4L,
-        0xC79A971FL, 0x35F1141CL, 0x26A1E7E8L, 0xD4CA64EBL,
-        0x8AD958CFL, 0x78B2DBCCL, 0x6BE22838L, 0x9989AB3BL,
-        0x4D43CFD0L, 0xBF284CD3L, 0xAC78BF27L, 0x5E133C24L,
-        0x105EC76FL, 0xE235446CL, 0xF165B798L, 0x030E349BL,
-        0xD7C45070L, 0x25AFD373L, 0x36FF2087L, 0xC494A384L,
-        0x9A879FA0L, 0x68EC1CA3L, 0x7BBCEF57L, 0x89D76C54L,
-        0x5D1D08BFL, 0xAF768BBCL, 0xBC267848L, 0x4E4DFB4BL,
-        0x20BD8EDEL, 0xD2D60DDDL, 0xC186FE29L, 0x33ED7D2AL,
-        0xE72719C1L, 0x154C9AC2L, 0x061C6936L, 0xF477EA35L,
-        0xAA64D611L, 0x580F5512L, 0x4B5FA6E6L, 0xB93425E5L,
-        0x6DFE410EL, 0x9F95C20DL, 0x8CC531F9L, 0x7EAEB2FAL,
-        0x30E349B1L, 0xC288CAB2L, 0xD1D83946L, 0x23B3BA45L,
-        0xF779DEAEL, 0x05125DADL, 0x1642AE59L, 0xE4292D5AL,
-        0xBA3A117EL, 0x4851927DL, 0x5B016189L, 0xA96AE28AL,
-        0x7DA08661L, 0x8FCB0562L, 0x9C9BF696L, 0x6EF07595L,
-        0x417B1DBCL, 0xB3109EBFL, 0xA0406D4BL, 0x522BEE48L,
-        0x86E18AA3L, 0x748A09A0L, 0x67DAFA54L, 0x95B17957L,
-        0xCBA24573L, 0x39C9C670L, 0x2A993584L, 0xD8F2B687L,
-        0x0C38D26CL, 0xFE53516FL, 0xED03A29BL, 0x1F682198L,
-        0x5125DAD3L, 0xA34E59D0L, 0xB01EAA24L, 0x42752927L,
-        0x96BF4DCCL, 0x64D4CECFL, 0x77843D3BL, 0x85EFBE38L,
-        0xDBFC821CL, 0x2997011FL, 0x3AC7F2EBL, 0xC8AC71E8L,
-        0x1C661503L, 0xEE0D9600L, 0xFD5D65F4L, 0x0F36E6F7L,
-        0x61C69362L, 0x93AD1061L, 0x80FDE395L, 0x72966096L,
-        0xA65C047DL, 0x5437877EL, 0x4767748AL, 0xB50CF789L,
-        0xEB1FCBADL, 0x197448AEL, 0x0A24BB5AL, 0xF84F3859L,
-        0x2C855CB2L, 0xDEEEDFB1L, 0xCDBE2C45L, 0x3FD5AF46L,
-        0x7198540DL, 0x83F3D70EL, 0x90A324FAL, 0x62C8A7F9L,
-        0xB602C312L, 0x44694011L, 0x5739B3E5L, 0xA55230E6L,
-        0xFB410CC2L, 0x092A8FC1L, 0x1A7A7C35L, 0xE811FF36L,
-        0x3CDB9BDDL, 0xCEB018DEL, 0xDDE0EB2AL, 0x2F8B6829L,
-        0x82F63B78L, 0x709DB87BL, 0x63CD4B8FL, 0x91A6C88CL,
-        0x456CAC67L, 0xB7072F64L, 0xA457DC90L, 0x563C5F93L,
-        0x082F63B7L, 0xFA44E0B4L, 0xE9141340L, 0x1B7F9043L,
-        0xCFB5F4A8L, 0x3DDE77ABL, 0x2E8E845FL, 0xDCE5075CL,
-        0x92A8FC17L, 0x60C37F14L, 0x73938CE0L, 0x81F80FE3L,
-        0x55326B08L, 0xA759E80BL, 0xB4091BFFL, 0x466298FCL,
-        0x1871A4D8L, 0xEA1A27DBL, 0xF94AD42FL, 0x0B21572CL,
-        0xDFEB33C7L, 0x2D80B0C4L, 0x3ED04330L, 0xCCBBC033L,
-        0xA24BB5A6L, 0x502036A5L, 0x4370C551L, 0xB11B4652L,
-        0x65D122B9L, 0x97BAA1BAL, 0x84EA524EL, 0x7681D14DL,
-        0x2892ED69L, 0xDAF96E6AL, 0xC9A99D9EL, 0x3BC21E9DL,
-        0xEF087A76L, 0x1D63F975L, 0x0E330A81L, 0xFC588982L,
-        0xB21572C9L, 0x407EF1CAL, 0x532E023EL, 0xA145813DL,
-        0x758FE5D6L, 0x87E466D5L, 0x94B49521L, 0x66DF1622L,
-        0x38CC2A06L, 0xCAA7A905L, 0xD9F75AF1L, 0x2B9CD9F2L,
-        0xFF56BD19L, 0x0D3D3E1AL, 0x1E6DCDEEL, 0xEC064EEDL,
-        0xC38D26C4L, 0x31E6A5C7L, 0x22B65633L, 0xD0DDD530L,
-        0x0417B1DBL, 0xF67C32D8L, 0xE52CC12CL, 0x1747422FL,
-        0x49547E0BL, 0xBB3FFD08L, 0xA86F0EFCL, 0x5A048DFFL,
-        0x8ECEE914L, 0x7CA56A17L, 0x6FF599E3L, 0x9D9E1AE0L,
-        0xD3D3E1ABL, 0x21B862A8L, 0x32E8915CL, 0xC083125FL,
-        0x144976B4L, 0xE622F5B7L, 0xF5720643L, 0x07198540L,
-        0x590AB964L, 0xAB613A67L, 0xB831C993L, 0x4A5A4A90L,
-        0x9E902E7BL, 0x6CFBAD78L, 0x7FAB5E8CL, 0x8DC0DD8FL,
-        0xE330A81AL, 0x115B2B19L, 0x020BD8EDL, 0xF0605BEEL,
-        0x24AA3F05L, 0xD6C1BC06L, 0xC5914FF2L, 0x37FACCF1L,
-        0x69E9F0D5L, 0x9B8273D6L, 0x88D28022L, 0x7AB90321L,
-        0xAE7367CAL, 0x5C18E4C9L, 0x4F48173DL, 0xBD23943EL,
-        0xF36E6F75L, 0x0105EC76L, 0x12551F82L, 0xE03E9C81L,
-        0x34F4F86AL, 0xC69F7B69L, 0xD5CF889DL, 0x27A40B9EL,
-        0x79B737BAL, 0x8BDCB4B9L, 0x988C474DL, 0x6AE7C44EL,
-        0xBE2DA0A5L, 0x4C4623A6L, 0x5F16D052L, 0xAD7D5351L
-};
 
-/*
- * Steps through buffer one byte at at time, calculates reflected 
- * crc using table.
- */
+EXPORT_SYMBOL(crc32c);
 
-u32 __pure
-crc32c_le(u32 crc, unsigned char const *data, size_t length)
+static int __init libcrc32c_mod_init(void)
 {
-        while (length--)
-                crc =
-                    crc32c_table[(crc ^ *data++) & 0xFFL] ^ (crc >> 8);
+        tfm = crypto_alloc_shash("crc32c", 0, 0);
+        if (IS_ERR(tfm))
+                return PTR_ERR(tfm);
 
-        return crc;
+        return 0;
 }
 
-#endif  /* CRC_LE_BITS == 8 */
-
-EXPORT_SYMBOL(crc32c_be);
-
-#if CRC_BE_BITS == 1
-u32 __pure
-crc32c_be(u32 crc, unsigned char const *p, size_t len)
+static void __exit libcrc32c_mod_fini(void)
 {
-        int i;
-        while (len--) {
-                crc ^= *p++ << 24;
-                for (i = 0; i < 8; i++)
-                        crc =
-                            (crc << 1) ^ ((crc & 0x80000000) ? CRC32C_POLY_BE :
-                                          0);
-        }
-        return crc;
+        crypto_free_shash(tfm);
 }
-#endif
 
-/*
- * Unit test
- *
- * A small unit test suite is implemented as part of the crypto suite.
- * Select CRYPTO_CRC32C and use the tcrypt module to run the tests.
- */
+module_init(libcrc32c_mod_init);
+module_exit(libcrc32c_mod_fini);
+
+MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");
+MODULE_DESCRIPTION("CRC32c (Castagnoli) calculations");
+MODULE_LICENSE("GPL");
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index a8663890a88c..b255b939bc1b 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -62,10 +62,7 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc)
         for_each_online_cpu(cpu) {
                 s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
                 ret += *pcount;
-                *pcount = 0;
         }
-        fbc->count = ret;
-
         spin_unlock(&fbc->lock);
         return ret;
 }
@@ -104,13 +101,13 @@ void percpu_counter_destroy(struct percpu_counter *fbc)
         if (!fbc->counters)
                 return;
 
-        free_percpu(fbc->counters);
-        fbc->counters = NULL;
 #ifdef CONFIG_HOTPLUG_CPU
         mutex_lock(&percpu_counters_lock);
         list_del(&fbc->list);
         mutex_unlock(&percpu_counters_lock);
 #endif
+        free_percpu(fbc->counters);
+        fbc->counters = NULL;
 }
 EXPORT_SYMBOL(percpu_counter_destroy);
 
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index a013bbc23717..3b777025d876 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -581,6 +581,62 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
         return string(buf, end, sym, field_width, precision, flags);
 }
 
+static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width,
+                                int precision, int flags)
+{
+        char mac_addr[6 * 3]; /* (6 * 2 hex digits), 5 colons and trailing zero */
+        char *p = mac_addr;
+        int i;
+
+        for (i = 0; i < 6; i++) {
+                p = pack_hex_byte(p, addr[i]);
+                if (!(flags & SPECIAL) && i != 5)
+                        *p++ = ':';
+        }
+        *p = '\0';
+
+        return string(buf, end, mac_addr, field_width, precision, flags & ~SPECIAL);
+}
+
+static char *ip6_addr_string(char *buf, char *end, u8 *addr, int field_width,
+                         int precision, int flags)
+{
+        char ip6_addr[8 * 5]; /* (8 * 4 hex digits), 7 colons and trailing zero */
+        char *p = ip6_addr;
+        int i;
+
+        for (i = 0; i < 8; i++) {
+                p = pack_hex_byte(p, addr[2 * i]);
+                p = pack_hex_byte(p, addr[2 * i + 1]);
+                if (!(flags & SPECIAL) && i != 7)
+                        *p++ = ':';
+        }
+        *p = '\0';
+
+        return string(buf, end, ip6_addr, field_width, precision, flags & ~SPECIAL);
+}
+
+static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
+                         int precision, int flags)
+{
+        char ip4_addr[4 * 4]; /* (4 * 3 decimal digits), 3 dots and trailing zero */
+        char temp[3];   /* hold each IP quad in reverse order */
+        char *p = ip4_addr;
+        int i, digits;
+
+        for (i = 0; i < 4; i++) {
+                digits = put_dec_trunc(temp, addr[i]) - temp;
+                /* reverse the digits in the quad */
+                while (digits--)
+                        *p++ = temp[digits];
+                if (i != 3)
+                        *p++ = '.';
+        }
+        *p = '\0';
+
+        return string(buf, end, ip4_addr, field_width, precision, flags & ~SPECIAL);
+}
+
 /*
  * Show a '%p' thing.  A kernel extension is that the '%p' is followed
  * by an extra set of alphanumeric characters that are extended format
@@ -592,6 +648,12 @@ static char *resource_string(char *buf, char *end, struct resource *res, int fie
  * - 'S' For symbolic direct pointers
  * - 'R' For a struct resource pointer, it prints the range of
  *       addresses (not the name nor the flags)
+ * - 'M' For a 6-byte MAC address, it prints the address in the
+ *       usual colon-separated hex notation
+ * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way (dot-separated
+ *       decimal for v4 and colon separated network-order 16 bit hex for v6)
+ * - 'i' [46] for 'raw' IPv4/IPv6 addresses, IPv6 omits the colons, IPv4 is
+ *       currently the same
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
@@ -607,6 +669,21 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
                 return symbol_string(buf, end, ptr, field_width, precision, flags);
         case 'R':
                 return resource_string(buf, end, ptr, field_width, precision, flags);
+        case 'm':
+                flags |= SPECIAL;
+                /* Fallthrough */
+        case 'M':
+                return mac_address_string(buf, end, ptr, field_width, precision, flags);
+        case 'i':
+                flags |= SPECIAL;
+                /* Fallthrough */
+        case 'I':
+                if (fmt[1] == '6')
+                        return ip6_addr_string(buf, end, ptr, field_width, precision, flags);
+                if (fmt[1] == '4')
+                        return ip4_addr_string(buf, end, ptr, field_width, precision, flags);
+                flags &= ~SPECIAL;
+                break;
         }
         flags |= SMALL;
         if (field_width == -1) {