Commit 657e4c34 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

netfilter: split nf_sockopt 



Split nf_sockopt into a getsockopt and setsockopt side as they share
very little code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c34bc10d

net/netfilter/nf_sockopt.c

+13 −17
Original line number Diff line number Diff line
@@ -89,36 +89,32 @@ static struct nf_sockopt_ops *nf_sockopt_find(struct sock *sk, u_int8_t pf, 
	return ops;

}



/* Call get/setsockopt() */

static int nf_sockopt(struct sock *sk, u_int8_t pf, int val,

		      char __user *opt, int *len, int get)

int nf_setsockopt(struct sock *sk, u_int8_t pf, int val, char __user *opt,

		  unsigned int len)

{

	struct nf_sockopt_ops *ops;

	int ret;



	ops = nf_sockopt_find(sk, pf, val, get);

	ops = nf_sockopt_find(sk, pf, val, 0);

	if (IS_ERR(ops))

		return PTR_ERR(ops);



	if (get)

		ret = ops->get(sk, val, opt, len);

	else

		ret = ops->set(sk, val, opt, *len);



	ret = ops->set(sk, val, opt, len);

	module_put(ops->owner);

	return ret;

}



int nf_setsockopt(struct sock *sk, u_int8_t pf, int val, char __user *opt,

		  unsigned int len)

{

	return nf_sockopt(sk, pf, val, opt, &len, 0);

}

EXPORT_SYMBOL(nf_setsockopt);



int nf_getsockopt(struct sock *sk, u_int8_t pf, int val, char __user *opt,

		  int *len)

{

	return nf_sockopt(sk, pf, val, opt, len, 1);

	struct nf_sockopt_ops *ops;

	int ret;



	ops = nf_sockopt_find(sk, pf, val, 1);

	if (IS_ERR(ops))

		return PTR_ERR(ops);

	ret = ops->get(sk, val, opt, len);

	module_put(ops->owner);

	return ret;

}

EXPORT_SYMBOL(nf_getsockopt);