Skip to content

Commit efe9e93

Browse files
Hoang Lesmb49
authored andcommitted
tipc: fix NULL deref in tipc_link_xmit()
BugLink: https://bugs.launchpad.net/bugs/1915186 [ Upstream commit b774134 ] The buffer list can have zero skb as following path: tipc_named_node_up()->tipc_node_xmit()->tipc_link_xmit(), so we need to check the list before casting an &sk_buff. Fault report: [] tipc: Bulk publication failure [] general protection fault, probably for non-canonical [#1] PREEMPT [...] [] KASAN: null-ptr-deref in range [0x00000000000000c8-0x00000000000000cf] [] CPU: 0 PID: 0 Comm: swapper/0 Kdump: loaded Not tainted 5.10.0-rc4+ #2 [] Hardware name: Bochs ..., BIOS Bochs 01/01/2011 [] RIP: 0010:tipc_link_xmit+0xc1/0x2180 [] Code: 24 b8 00 00 00 00 4d 39 ec 4c 0f 44 e8 e8 d7 0a 10 f9 48 [...] [] RSP: 0018:ffffc90000006ea0 EFLAGS: 00010202 [] RAX: dffffc0000000000 RBX: ffff8880224da000 RCX: 1ffff11003d3cc0d [] RDX: 0000000000000019 RSI: ffffffff886007b9 RDI: 00000000000000c8 [] RBP: ffffc90000007018 R08: 0000000000000001 R09: fffff52000000ded [] R10: 0000000000000003 R11: fffff52000000dec R12: ffffc90000007148 [] R13: 0000000000000000 R14: 0000000000000000 R15: ffffc90000007018 [] FS: 0000000000000000(0000) GS:ffff888037400000(0000) knlGS:000[...] [] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [] CR2: 00007fffd2db5000 CR3: 000000002b08f000 CR4: 00000000000006f0 Fixes: af9b028 ("tipc: make media xmit call outside node spinlock context") Acked-by: Jon Maloy <jmaloy@redhat.com> Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au> Link: https://lore.kernel.org/r/20210108071337.3598-1-hoang.h.le@dektech.com.au Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: William Breathitt Gray <william.gray@canonical.com>
1 parent a25a66b commit efe9e93

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

net/tipc/link.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,9 +939,7 @@ void tipc_link_reset(struct tipc_link *l)
939939
int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
940940
struct sk_buff_head *xmitq)
941941
{
942-
struct tipc_msg *hdr = buf_msg(skb_peek(list));
943942
unsigned int maxwin = l->window;
944-
int imp = msg_importance(hdr);
945943
unsigned int mtu = l->mtu;
946944
u16 ack = l->rcv_nxt - 1;
947945
u16 seqno = l->snd_nxt;
@@ -950,8 +948,14 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
950948
struct sk_buff_head *backlogq = &l->backlogq;
951949
struct sk_buff *skb, *_skb, **tskb;
952950
int pkt_cnt = skb_queue_len(list);
951+
struct tipc_msg *hdr;
953952
int rc = 0;
953+
int imp;
954+
955+
if (pkt_cnt <= 0)
956+
return 0;
954957

958+
hdr = buf_msg(skb_peek(list));
955959
if (unlikely(msg_size(hdr) > mtu)) {
956960
pr_warn("Too large msg, purging xmit list %d %d %d %d %d!\n",
957961
skb_queue_len(list), msg_user(hdr),
@@ -960,6 +964,7 @@ int tipc_link_xmit(struct tipc_link *l, struct sk_buff_head *list,
960964
return -EMSGSIZE;
961965
}
962966

967+
imp = msg_importance(hdr);
963968
/* Allow oversubscription of one data msg per source at congestion */
964969
if (unlikely(l->backlog[imp].len >= l->backlog[imp].limit)) {
965970
if (imp == TIPC_SYSTEM_IMPORTANCE) {

0 commit comments

Comments
 (0)