Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19102996 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

dccp: Tidy up setsockopt calls 



This splits the setsockopt calls into two groups, depending on whether an
integer argument (val) is required and whether routines being called do
their own locking.

Some options (such as setting the CCID) use u8 rather than int, so that for
these the test with regard to integer-sizeof can not be used.

The second switch-case statement now only has those statements which need
locking and which make use of `val'.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Reviewed-by: default avatarEugene Teo <eugeneteo@kernel.sg>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd9c0e36

net/dccp/proto.c

+12 −11
Original line number Diff line number Diff line
@@ -512,7 +512,17 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname, 
	struct dccp_sock *dp = dccp_sk(sk);

	int val, err = 0;



	if (optlen < sizeof(int))

	switch (optname) {

	case DCCP_SOCKOPT_PACKET_SIZE:

		DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");

		return 0;

	case DCCP_SOCKOPT_CHANGE_L:

	case DCCP_SOCKOPT_CHANGE_R:

		DCCP_WARN("sockopt(CHANGE_L/R) is deprecated: fix your app\n");

		return 0;

	}



	if (optlen < (int)sizeof(int))

		return -EINVAL;



	if (get_user(val, (int __user *)optval))
@@ -523,15 +533,6 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname, 


	lock_sock(sk);

	switch (optname) {

	case DCCP_SOCKOPT_PACKET_SIZE:

		DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");

		err = 0;

		break;

	case DCCP_SOCKOPT_CHANGE_L:

	case DCCP_SOCKOPT_CHANGE_R:

		DCCP_WARN("sockopt(CHANGE_L/R) is deprecated: fix your app\n");

		err = 0;

		break;

	case DCCP_SOCKOPT_SERVER_TIMEWAIT:

		if (dp->dccps_role != DCCP_ROLE_SERVER)

			err = -EOPNOTSUPP;
@@ -548,8 +549,8 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname, 
		err = -ENOPROTOOPT;

		break;

	}



	release_sock(sk);



	return err;

}