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

Commit ccb48e83 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-fix-uninit-values-in-networking-stack' 



Eric Dumazet says:

====================
net: fix uninit-values in networking stack

It seems syzbot got new features enabled, and fired some interesting
reports. Oh well.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f12c6432 3099a529

crypto/af_alg.c

+4 −4
Original line number Diff line number Diff line
@@ -158,16 +158,16 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
	void *private;

	int err;



	/* If caller uses non-allowed flag, return error. */

	if ((sa->salg_feat & ~allowed) || (sa->salg_mask & ~allowed))

		return -EINVAL;



	if (sock->state == SS_CONNECTED)

		return -EINVAL;



	if (addr_len < sizeof(*sa))

		return -EINVAL;



	/* If caller uses non-allowed flag, return error. */

	if ((sa->salg_feat & ~allowed) || (sa->salg_mask & ~allowed))

		return -EINVAL;



	sa->salg_type[sizeof(sa->salg_type) - 1] = 0;

	sa->salg_name[sizeof(sa->salg_name) + addr_len - sizeof(*sa) - 1] = 0;

include/net/inet_timewait_sock.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct inet_timewait_sock { 
#define tw_family		__tw_common.skc_family

#define tw_state		__tw_common.skc_state

#define tw_reuse		__tw_common.skc_reuse

#define tw_reuseport		__tw_common.skc_reuseport

#define tw_ipv6only		__tw_common.skc_ipv6only

#define tw_bound_dev_if		__tw_common.skc_bound_dev_if

#define tw_node			__tw_common.skc_nulls_node

include/net/nexthop.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


static inline int rtnh_ok(const struct rtnexthop *rtnh, int remaining)

{

	return remaining >= sizeof(*rtnh) &&

	return remaining >= (int)sizeof(*rtnh) &&

	       rtnh->rtnh_len >= sizeof(*rtnh) &&

	       rtnh->rtnh_len <= remaining;

}

net/core/dev_addr_lists.c

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ static int __hw_addr_add_ex(struct netdev_hw_addr_list *list, 
		return -EINVAL;



	list_for_each_entry(ha, &list->list, list) {

		if (!memcmp(ha->addr, addr, addr_len) &&

		    ha->type == addr_type) {

		if (ha->type == addr_type &&

		    !memcmp(ha->addr, addr, addr_len)) {

			if (global) {

				/* check if addr is already used as global */

				if (ha->global_use)

net/core/skbuff.c

+1 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb) 
	n->hdr_len = skb->nohdr ? skb_headroom(skb) : skb->hdr_len;

	n->cloned = 1;

	n->nohdr = 0;

	n->peeked = 0;

	n->destructor = NULL;

	C(tail);

	C(end);