af_packet: packet_getsockopt() cleanup
Factorize code, since most fetched values are int type. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
900f65d361
commit
c06fff6e17
|
@ -3224,10 +3224,10 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
|
||||||
char __user *optval, int __user *optlen)
|
char __user *optval, int __user *optlen)
|
||||||
{
|
{
|
||||||
int len;
|
int len;
|
||||||
int val;
|
int val, lv = sizeof(val);
|
||||||
struct sock *sk = sock->sk;
|
struct sock *sk = sock->sk;
|
||||||
struct packet_sock *po = pkt_sk(sk);
|
struct packet_sock *po = pkt_sk(sk);
|
||||||
void *data;
|
void *data = &val;
|
||||||
struct tpacket_stats st;
|
struct tpacket_stats st;
|
||||||
union tpacket_stats_u st_u;
|
union tpacket_stats_u st_u;
|
||||||
|
|
||||||
|
@ -3242,14 +3242,9 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
|
||||||
|
|
||||||
switch (optname) {
|
switch (optname) {
|
||||||
case PACKET_STATISTICS:
|
case PACKET_STATISTICS:
|
||||||
if (po->tp_version == TPACKET_V3) {
|
|
||||||
len = sizeof(struct tpacket_stats_v3);
|
|
||||||
} else {
|
|
||||||
if (len > sizeof(struct tpacket_stats))
|
|
||||||
len = sizeof(struct tpacket_stats);
|
|
||||||
}
|
|
||||||
spin_lock_bh(&sk->sk_receive_queue.lock);
|
spin_lock_bh(&sk->sk_receive_queue.lock);
|
||||||
if (po->tp_version == TPACKET_V3) {
|
if (po->tp_version == TPACKET_V3) {
|
||||||
|
lv = sizeof(struct tpacket_stats_v3);
|
||||||
memcpy(&st_u.stats3, &po->stats,
|
memcpy(&st_u.stats3, &po->stats,
|
||||||
sizeof(struct tpacket_stats));
|
sizeof(struct tpacket_stats));
|
||||||
st_u.stats3.tp_freeze_q_cnt =
|
st_u.stats3.tp_freeze_q_cnt =
|
||||||
|
@ -3257,6 +3252,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
|
||||||
st_u.stats3.tp_packets += po->stats.tp_drops;
|
st_u.stats3.tp_packets += po->stats.tp_drops;
|
||||||
data = &st_u.stats3;
|
data = &st_u.stats3;
|
||||||
} else {
|
} else {
|
||||||
|
lv = sizeof(struct tpacket_stats);
|
||||||
st = po->stats;
|
st = po->stats;
|
||||||
st.tp_packets += st.tp_drops;
|
st.tp_packets += st.tp_drops;
|
||||||
data = &st;
|
data = &st;
|
||||||
|
@ -3265,31 +3261,16 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
|
||||||
spin_unlock_bh(&sk->sk_receive_queue.lock);
|
spin_unlock_bh(&sk->sk_receive_queue.lock);
|
||||||
break;
|
break;
|
||||||
case PACKET_AUXDATA:
|
case PACKET_AUXDATA:
|
||||||
if (len > sizeof(int))
|
|
||||||
len = sizeof(int);
|
|
||||||
val = po->auxdata;
|
val = po->auxdata;
|
||||||
|
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_ORIGDEV:
|
case PACKET_ORIGDEV:
|
||||||
if (len > sizeof(int))
|
|
||||||
len = sizeof(int);
|
|
||||||
val = po->origdev;
|
val = po->origdev;
|
||||||
|
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_VNET_HDR:
|
case PACKET_VNET_HDR:
|
||||||
if (len > sizeof(int))
|
|
||||||
len = sizeof(int);
|
|
||||||
val = po->has_vnet_hdr;
|
val = po->has_vnet_hdr;
|
||||||
|
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_VERSION:
|
case PACKET_VERSION:
|
||||||
if (len > sizeof(int))
|
|
||||||
len = sizeof(int);
|
|
||||||
val = po->tp_version;
|
val = po->tp_version;
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_HDRLEN:
|
case PACKET_HDRLEN:
|
||||||
if (len > sizeof(int))
|
if (len > sizeof(int))
|
||||||
|
@ -3309,39 +3290,28 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_RESERVE:
|
case PACKET_RESERVE:
|
||||||
if (len > sizeof(unsigned int))
|
|
||||||
len = sizeof(unsigned int);
|
|
||||||
val = po->tp_reserve;
|
val = po->tp_reserve;
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_LOSS:
|
case PACKET_LOSS:
|
||||||
if (len > sizeof(unsigned int))
|
|
||||||
len = sizeof(unsigned int);
|
|
||||||
val = po->tp_loss;
|
val = po->tp_loss;
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_TIMESTAMP:
|
case PACKET_TIMESTAMP:
|
||||||
if (len > sizeof(int))
|
|
||||||
len = sizeof(int);
|
|
||||||
val = po->tp_tstamp;
|
val = po->tp_tstamp;
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
case PACKET_FANOUT:
|
case PACKET_FANOUT:
|
||||||
if (len > sizeof(int))
|
|
||||||
len = sizeof(int);
|
|
||||||
val = (po->fanout ?
|
val = (po->fanout ?
|
||||||
((u32)po->fanout->id |
|
((u32)po->fanout->id |
|
||||||
((u32)po->fanout->type << 16)) :
|
((u32)po->fanout->type << 16)) :
|
||||||
0);
|
0);
|
||||||
data = &val;
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (len > lv)
|
||||||
|
len = lv;
|
||||||
if (put_user(len, optlen))
|
if (put_user(len, optlen))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
if (copy_to_user(optval, data, len))
|
if (copy_to_user(optval, data, len))
|
||||||
|
|
Loading…
Reference in New Issue