Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: Eliminate no_check from protosw

Browse source 
It doesn't seem like an protocols are setting anything other
than the default, and allowing to arbitrarily disable checksums
for a whole protocol seems dangerous. This can be done on a per
socket basis.

Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tom Herbert 2014-05-23 08:47:09 -07:00 committed by David S. Miller
parent 0f8066bd48
commit b26ba202e0
14 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/protocol.h
View file

@ -86,7 +86,6 @@ struct inet_protosw {
struct proto *prot; struct proto *prot;
const struct proto_ops *ops; const struct proto_ops *ops;
char no_check; /* checksum on rcv/xmit/none? */
unsigned char flags; /* See INET_PROTOSW_* below. */ unsigned char flags; /* See INET_PROTOSW_* below. */
}; };
#define INET_PROTOSW_REUSE 0x01 /* Are ports automatically reusable? */ #define INET_PROTOSW_REUSE 0x01 /* Are ports automatically reusable? */

1
net/dccp/ipv4.c
View file

@ -1024,7 +1024,6 @@ static struct inet_protosw dccp_v4_protosw = {
.protocol = IPPROTO_DCCP, .protocol = IPPROTO_DCCP,
.prot = &dccp_v4_prot, .prot = &dccp_v4_prot,
.ops = &inet_dccp_ops, .ops = &inet_dccp_ops,
.no_check = 0,
.flags = INET_PROTOSW_ICSK, .flags = INET_PROTOSW_ICSK,
}; };

7
net/ipv4/af_inet.c
View file

@ -254,7 +254,6 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
struct inet_sock *inet; struct inet_sock *inet;
struct proto *answer_prot; struct proto *answer_prot;
unsigned char answer_flags; unsigned char answer_flags;
char answer_no_check;
int try_loading_module = 0; int try_loading_module = 0;
int err; int err;
@ -312,7 +311,6 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
sock->ops = answer->ops; sock->ops = answer->ops;
answer_prot = answer->prot; answer_prot = answer->prot;
answer_no_check = answer->no_check;
answer_flags = answer->flags; answer_flags = answer->flags;
rcu_read_unlock(); rcu_read_unlock();
@ -324,7 +322,6 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
goto out; goto out;
err = 0; err = 0;
sk->sk_no_check = answer_no_check;
if (INET_PROTOSW_REUSE & answer_flags) if (INET_PROTOSW_REUSE & answer_flags)
sk->sk_reuse = SK_CAN_REUSE; sk->sk_reuse = SK_CAN_REUSE;
@ -1002,7 +999,6 @@ static struct inet_protosw inetsw_array[] =
.protocol = IPPROTO_TCP, .protocol = IPPROTO_TCP,
.prot = &tcp_prot, .prot = &tcp_prot,
.ops = &inet_stream_ops, .ops = &inet_stream_ops,
.no_check = 0,
.flags = INET_PROTOSW_PERMANENT | .flags = INET_PROTOSW_PERMANENT |
INET_PROTOSW_ICSK, INET_PROTOSW_ICSK,
}, },
@ -1012,7 +1008,6 @@ static struct inet_protosw inetsw_array[] =
.protocol = IPPROTO_UDP, .protocol = IPPROTO_UDP,
.prot = &udp_prot, .prot = &udp_prot,
.ops = &inet_dgram_ops, .ops = &inet_dgram_ops,
.no_check = UDP_CSUM_DEFAULT,
.flags = INET_PROTOSW_PERMANENT, .flags = INET_PROTOSW_PERMANENT,
}, },
@ -1021,7 +1016,6 @@ static struct inet_protosw inetsw_array[] =
.protocol = IPPROTO_ICMP, .protocol = IPPROTO_ICMP,
.prot = &ping_prot, .prot = &ping_prot,
.ops = &inet_dgram_ops, .ops = &inet_dgram_ops,
.no_check = UDP_CSUM_DEFAULT,
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
}, },
@ -1030,7 +1024,6 @@ static struct inet_protosw inetsw_array[] =
.protocol = IPPROTO_IP, /* wild card */ .protocol = IPPROTO_IP, /* wild card */
.prot = &raw_prot, .prot = &raw_prot,
.ops = &inet_sockraw_ops, .ops = &inet_sockraw_ops,
.no_check = UDP_CSUM_DEFAULT,
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
} }
}; };

1
net/ipv4/udplite.c
View file

@ -70,7 +70,6 @@ static struct inet_protosw udplite4_protosw = {
.protocol = IPPROTO_UDPLITE, .protocol = IPPROTO_UDPLITE,
.prot = &udplite_prot, .prot = &udplite_prot,
.ops = &inet_dgram_ops, .ops = &inet_dgram_ops,
.no_check = 0, /* must checksum (RFC 3828) */
.flags = INET_PROTOSW_PERMANENT, .flags = INET_PROTOSW_PERMANENT,
}; };

3
net/ipv6/af_inet6.c
View file

@ -106,7 +106,6 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
struct inet_protosw *answer; struct inet_protosw *answer;
struct proto *answer_prot; struct proto *answer_prot;
unsigned char answer_flags; unsigned char answer_flags;
char answer_no_check;
int try_loading_module = 0; int try_loading_module = 0;
int err; int err;
@ -162,7 +161,6 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
sock->ops = answer->ops; sock->ops = answer->ops;
answer_prot = answer->prot; answer_prot = answer->prot;
answer_no_check = answer->no_check;
answer_flags = answer->flags; answer_flags = answer->flags;
rcu_read_unlock(); rcu_read_unlock();
@ -176,7 +174,6 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
sock_init_data(sock, sk); sock_init_data(sock, sk);
err = 0; err = 0;
sk->sk_no_check = answer_no_check;
if (INET_PROTOSW_REUSE & answer_flags) if (INET_PROTOSW_REUSE & answer_flags)
sk->sk_reuse = SK_CAN_REUSE; sk->sk_reuse = SK_CAN_REUSE;

1
net/ipv6/ping.c
View file

@ -51,7 +51,6 @@ static struct inet_protosw pingv6_protosw = {
.protocol = IPPROTO_ICMPV6, .protocol = IPPROTO_ICMPV6,
.prot = &pingv6_prot, .prot = &pingv6_prot,
.ops = &inet6_dgram_ops, .ops = &inet6_dgram_ops,
.no_check = UDP_CSUM_DEFAULT,
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
}; };

1
net/ipv6/raw.c
View file

@ -1322,7 +1322,6 @@ static struct inet_protosw rawv6_protosw = {
.protocol = IPPROTO_IP, /* wild card */ .protocol = IPPROTO_IP, /* wild card */
.prot = &rawv6_prot, .prot = &rawv6_prot,
.ops = &inet6_sockraw_ops, .ops = &inet6_sockraw_ops,
.no_check = UDP_CSUM_DEFAULT,
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
}; };

1
net/ipv6/tcp_ipv6.c
View file

@ -1992,7 +1992,6 @@ static struct inet_protosw tcpv6_protosw = {
.protocol = IPPROTO_TCP, .protocol = IPPROTO_TCP,
.prot = &tcpv6_prot, .prot = &tcpv6_prot,
.ops = &inet6_stream_ops, .ops = &inet6_stream_ops,
.no_check = 0,
.flags = INET_PROTOSW_PERMANENT | .flags = INET_PROTOSW_PERMANENT |
INET_PROTOSW_ICSK, INET_PROTOSW_ICSK,
}; };

1
net/ipv6/udp.c
View file

@ -1507,7 +1507,6 @@ static struct inet_protosw udpv6_protosw = {
.protocol = IPPROTO_UDP, .protocol = IPPROTO_UDP,
.prot = &udpv6_prot, .prot = &udpv6_prot,
.ops = &inet6_dgram_ops, .ops = &inet6_dgram_ops,
.no_check = UDP_CSUM_DEFAULT,
.flags = INET_PROTOSW_PERMANENT, .flags = INET_PROTOSW_PERMANENT,
}; };

1
net/ipv6/udplite.c
View file

@ -64,7 +64,6 @@ static struct inet_protosw udplite6_protosw = {
.protocol = IPPROTO_UDPLITE, .protocol = IPPROTO_UDPLITE,
.prot = &udplitev6_prot, .prot = &udplitev6_prot,
.ops = &inet6_dgram_ops, .ops = &inet6_dgram_ops,
.no_check = 0,
.flags = INET_PROTOSW_PERMANENT, .flags = INET_PROTOSW_PERMANENT,
}; };

1
net/l2tp/l2tp_ip.c
View file

@ -606,7 +606,6 @@ static struct inet_protosw l2tp_ip_protosw = {
.protocol = IPPROTO_L2TP, .protocol = IPPROTO_L2TP,
.prot = &l2tp_ip_prot, .prot = &l2tp_ip_prot,
.ops = &l2tp_ip_ops, .ops = &l2tp_ip_ops,
.no_check = 0,
}; };
static struct net_protocol l2tp_ip_protocol __read_mostly = { static struct net_protocol l2tp_ip_protocol __read_mostly = {

1
net/l2tp/l2tp_ip6.c
View file

@ -755,7 +755,6 @@ static struct inet_protosw l2tp_ip6_protosw = {
.protocol = IPPROTO_L2TP, .protocol = IPPROTO_L2TP,
.prot = &l2tp_ip6_prot, .prot = &l2tp_ip6_prot,
.ops = &l2tp_ip6_ops, .ops = &l2tp_ip6_ops,
.no_check = 0,
}; };
static struct inet6_protocol l2tp_ip6_protocol __read_mostly = { static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {

2
net/sctp/ipv6.c
View file

@ -943,7 +943,6 @@ static struct inet_protosw sctpv6_seqpacket_protosw = {
.protocol = IPPROTO_SCTP, .protocol = IPPROTO_SCTP,
.prot = &sctpv6_prot, .prot = &sctpv6_prot,
.ops = &inet6_seqpacket_ops, .ops = &inet6_seqpacket_ops,
.no_check = 0,
.flags = SCTP_PROTOSW_FLAG .flags = SCTP_PROTOSW_FLAG
}; };
static struct inet_protosw sctpv6_stream_protosw = { static struct inet_protosw sctpv6_stream_protosw = {
@ -951,7 +950,6 @@ static struct inet_protosw sctpv6_stream_protosw = {
.protocol = IPPROTO_SCTP, .protocol = IPPROTO_SCTP,
.prot = &sctpv6_prot, .prot = &sctpv6_prot,
.ops = &inet6_seqpacket_ops, .ops = &inet6_seqpacket_ops,
.no_check = 0,
.flags = SCTP_PROTOSW_FLAG, .flags = SCTP_PROTOSW_FLAG,
}; };

2
net/sctp/protocol.c
View file

@ -1017,7 +1017,6 @@ static struct inet_protosw sctp_seqpacket_protosw = {
.protocol = IPPROTO_SCTP, .protocol = IPPROTO_SCTP,
.prot = &sctp_prot, .prot = &sctp_prot,
.ops = &inet_seqpacket_ops, .ops = &inet_seqpacket_ops,
.no_check = 0,
.flags = SCTP_PROTOSW_FLAG .flags = SCTP_PROTOSW_FLAG
}; };
static struct inet_protosw sctp_stream_protosw = { static struct inet_protosw sctp_stream_protosw = {
@ -1025,7 +1024,6 @@ static struct inet_protosw sctp_stream_protosw = {
.protocol = IPPROTO_SCTP, .protocol = IPPROTO_SCTP,
.prot = &sctp_prot, .prot = &sctp_prot,
.ops = &inet_seqpacket_ops, .ops = &inet_seqpacket_ops,
.no_check = 0,
.flags = SCTP_PROTOSW_FLAG .flags = SCTP_PROTOSW_FLAG
}; };