Re: [syzbot] Re: [PATCH] net: Fix kernel-infoleak in __skb_datagram_iter (2)

[syzbot]

For archival purposes, forwarding an incoming command email to
linux-kernel@xxxxxxxxxxxxxxx.

***

Subject: Re: [PATCH] net: Fix kernel-infoleak in __skb_datagram_iter (2)
Author: ryasuoka@xxxxxxxxxx

#syz test: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
master

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 2dde34c29203..540df9a6a9b3 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2542,6 +2542,11 @@ static inline unsigned char
*skb_tail_pointer(const struct sk_buff *skb)
        return skb->head + skb->tail;
 }

+static inline unsigned int skb_tail_offset(const struct sk_buff *skb)
+{
+       return skb->tail;
+}
+
 static inline void skb_reset_tail_pointer(struct sk_buff *skb)
 {
        skb->tail = skb->data - skb->head;
@@ -2559,6 +2564,11 @@ static inline unsigned char
*skb_tail_pointer(const struct sk_buff *skb)
        return skb->tail;
 }

+static inline unsigned int skb_tail_offset(const struct sk_buff *skb)
+{
+       return skb->tail - skb->head;
+}
+
 static inline void skb_reset_tail_pointer(struct sk_buff *skb)
 {
        skb->tail = skb->data;
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 9c962347cf85..d1b8e02c7e44 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -167,7 +167,7 @@ static inline u32 netlink_group_mask(u32 group)
 static struct sk_buff *netlink_to_full_skb(const struct sk_buff *skb,
                                           gfp_t gfp_mask)
 {
-       unsigned int len = skb_end_offset(skb);
+       unsigned int len = skb_tail_offset(skb);
        struct sk_buff *new;

        new = alloc_skb(len, gfp_mask);