sctp: remove dup code in net/sctp/socket.c
Subsystems (2)
PATCH 2/4 sctp: remove dup code in net/sctp/socket.c
Remove dup check of "if (optlen < sizeof(int))".
Signed-off-by Wei Yongjun <[email protected]>
--- net/sctp/socket.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
net/sctp/socket.c +0 -6
@@ -3069,9 +3069,6 @@ static int sctp_setsockopt_maxburst(struct sock *sk,int val;int assoc_id =0 ; -if (optlen <sizeof (int )) -return -EINVAL ; -if (optlen =sizeof (int )) {printk (KERN_WARNING "SCTP: Use of int in max_burst socket option deprecated\n" );
@@ -5283,9 +5280,6 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len,struct sctp_sock *sp;struct sctp_association *asoc; -if (len <sizeof (int )) -return -EINVAL ; -if (len =sizeof (int )) {printk (KERN_WARNING "SCTP: Use of int in max_burst socket option deprecated\n" );
Signature · 1 line
1.5.3.8
Quoted 22 lines · Wei Yongjun
Remove dup check of "if (optlen < sizeof(int))".
Signed-off-by Wei Yongjun <[email protected]>--- net/sctp/socket.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)net/sctp/socket.c +0
-3@@ -3069,9 +3069,6 @@ static int sctp_setsockopt_maxburst(struct sock *sk,int val;int assoc_id =0 ; -if (optlen <sizeof (int )) -return -EINVAL ; -if (optlen =sizeof (int )) {printk (KERN_WARNING "SCTP: Use of int in max_burst socket option deprecated\n" );
net/sctp/socket.c static int sctp_getsockopt_maxburst(struct sock *sk, int len, · line 5285
Quoted 9 lines
net/sctp/socket.c +0
-3@@ -5283,9 +5280,6 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len,struct sctp_sock *sp;struct sctp_association *asoc; -if (len <sizeof (int )) -return -EINVAL ; -if (len =sizeof (int )) {printk (KERN_WARNING "SCTP: Use of int in max_burst socket option deprecated\n" );
Ok, but there is another bug here. The code in getsockopt_maxburst doesn't allow len to be larger then sctp_assoc_params, which is a common case where app writers just pass down the sizeof(buf) or something similar.
Thanks
-vlad