mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three sets of overlapping changes, two in the packet scheduler and one in the meson-gxl PHY driver. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
c30abd5e40
446 changed files with 2942 additions and 3463 deletions
|
|
@ -3924,13 +3924,17 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,
|
|||
struct sctp_association *asoc;
|
||||
int retval = -EINVAL;
|
||||
|
||||
if (optlen < sizeof(struct sctp_reset_streams))
|
||||
if (optlen < sizeof(*params))
|
||||
return -EINVAL;
|
||||
|
||||
params = memdup_user(optval, optlen);
|
||||
if (IS_ERR(params))
|
||||
return PTR_ERR(params);
|
||||
|
||||
if (params->srs_number_streams * sizeof(__u16) >
|
||||
optlen - sizeof(*params))
|
||||
goto out;
|
||||
|
||||
asoc = sctp_id2assoc(sk, params->srs_assoc_id);
|
||||
if (!asoc)
|
||||
goto out;
|
||||
|
|
|
|||
Loading…
Reference in a new issue