Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of bug fixes in 'net' overlapping other changes in
'net-next-.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2016-11-15 10:54:36 -05:00
commit bb598c1b8c
580 changed files with 7286 additions and 4003 deletions

View file

@ -178,11 +178,8 @@ static int netlink_diag_dump(struct sk_buff *skb, struct netlink_callback *cb)
}
cb->args[1] = i;
} else {
if (req->sdiag_protocol >= MAX_LINKS) {
read_unlock(&nl_table_lock);
rcu_read_unlock();
if (req->sdiag_protocol >= MAX_LINKS)
return -ENOENT;
}
err = __netlink_diag_dump(skb, cb, req->sdiag_protocol, s_num);
}

View file

@ -383,6 +383,7 @@ int genl_register_family(struct genl_family *family)
errout_remove:
idr_remove(&genl_fam_idr, family->id);
kfree(family->attrbuf);
errout_locked:
genl_unlock_all();
return err;