Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 269958f4 authored by Xin Long's avatar Xin Long Committed by Greg Kroah-Hartman
Browse files

sctp: allocate sctp_sockaddr_entry with kzalloc 



commit 400b8b9a2a17918f8ce00786f596f530e7f30d50 upstream.

The similar issue as fixed in Commit 4a2eb0c37b47 ("sctp: initialize
sin6_flowinfo for ipv6 addrs in sctp_inet6addr_event") also exists
in sctp_inetaddr_event, as Alexander noticed.

To fix it, allocate sctp_sockaddr_entry with kzalloc for both sctp
ipv4 and ipv6 addresses, as does in sctp_v4/6_copy_addrlist().

Reported-by: default avatarAlexander Potapenko <glider@google.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Reported-by: default avatar <syzbot+ae0c70c0c2d40c51bb92@syzkaller.appspotmail.com>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 428ca580

net/sctp/ipv6.c

+1 −4
Original line number Diff line number Diff line
@@ -97,11 +97,9 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev, 


	switch (ev) {

	case NETDEV_UP:

		addr = kmalloc(sizeof(struct sctp_sockaddr_entry), GFP_ATOMIC);

		addr = kzalloc(sizeof(*addr), GFP_ATOMIC);

		if (addr) {

			addr->a.v6.sin6_family = AF_INET6;

			addr->a.v6.sin6_port = 0;

			addr->a.v6.sin6_flowinfo = 0;

			addr->a.v6.sin6_addr = ifa->addr;

			addr->a.v6.sin6_scope_id = ifa->idev->dev->ifindex;

			addr->valid = 1;
@@ -413,7 +411,6 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist, 
		addr = kzalloc(sizeof(*addr), GFP_ATOMIC);

		if (addr) {

			addr->a.v6.sin6_family = AF_INET6;

			addr->a.v6.sin6_port = 0;

			addr->a.v6.sin6_addr = ifp->addr;

			addr->a.v6.sin6_scope_id = dev->ifindex;

			addr->valid = 1;

net/sctp/protocol.c

+1 −3
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ static void sctp_v4_copy_addrlist(struct list_head *addrlist, 
		addr = kzalloc(sizeof(*addr), GFP_ATOMIC);

		if (addr) {

			addr->a.v4.sin_family = AF_INET;

			addr->a.v4.sin_port = 0;

			addr->a.v4.sin_addr.s_addr = ifa->ifa_local;

			addr->valid = 1;

			INIT_LIST_HEAD(&addr->list);
@@ -777,10 +776,9 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev, 


	switch (ev) {

	case NETDEV_UP:

		addr = kmalloc(sizeof(struct sctp_sockaddr_entry), GFP_ATOMIC);

		addr = kzalloc(sizeof(*addr), GFP_ATOMIC);

		if (addr) {

			addr->a.v4.sin_family = AF_INET;

			addr->a.v4.sin_port = 0;

			addr->a.v4.sin_addr.s_addr = ifa->ifa_local;

			addr->valid = 1;

			spin_lock_bh(&net->sctp.local_addr_lock);