From c8fc876b0bc2238de51e01aa73dfe0670168c52f Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Wed, 27 Feb 2013 10:57:31 +0000 Subject: [PATCH] --- yaml --- r: 360779 b: refs/heads/master c: 726bc6b092da4c093eb74d13c07184b18c1af0f1 h: refs/heads/master i: 360777: b5d166cb22057523f368de2fd6ae41e10eb2cf55 360775: 039814c9f9414d4c35a4a85840123d8bee5405aa v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b6668b86b1fd..28dfc47e67f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45af3fb4a018ef84bf1c9f2dfbd887a41242e77f +refs/heads/master: 726bc6b092da4c093eb74d13c07184b18c1af0f1 diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index cedd9bf67b8c..9ef5c7312e12 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -5653,6 +5653,9 @@ static int sctp_getsockopt_assoc_stats(struct sock *sk, int len, if (len < sizeof(sctp_assoc_t)) return -EINVAL; + /* Allow the struct to grow and fill in as much as possible */ + len = min_t(size_t, len, sizeof(sas)); + if (copy_from_user(&sas, optval, len)) return -EFAULT; @@ -5686,9 +5689,6 @@ static int sctp_getsockopt_assoc_stats(struct sock *sk, int len, /* Mark beginning of a new observation period */ asoc->stats.max_obs_rto = asoc->rto_min; - /* Allow the struct to grow and fill in as much as possible */ - len = min_t(size_t, len, sizeof(sas)); - if (put_user(len, optlen)) return -EFAULT;