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

Merge tag 'batadv-net-for-davem-20190821' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
Here is a batman-adv bugfix:

 - fix uninit-value in batadv_netlink_get_ifindex(), by Eric Dumazet
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents aad12c23 3ee1bb7a

net/batman-adv/netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype) 
{

	struct nlattr *attr = nlmsg_find_attr(nlh, GENL_HDRLEN, attrtype);



	return attr ? nla_get_u32(attr) : 0;

	return (attr && nla_len(attr) == sizeof(u32)) ? nla_get_u32(attr) : 0;

}



/**