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

[NETFILTER]: PPTP conntrack: fix header definitions

Browse source 
Fix a few header definitions to match RFC2637. Most importantly the
PptpOutCallRequest header included an invalid padding field and a
size check was disabled because of this.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2006-09-20 12:08:56 -07:00 • committed by David S. Miller
parent 5256f663a0
commit 6013c0a13e
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/linux/netfilter_ipv4/ip_conntrack_pptp.h
View file

@ -107,8 +107,7 @@ struct PptpControlHeader {
struct PptpStartSessionRequest { struct PptpStartSessionRequest {
__be16 protocolVersion; __be16 protocolVersion;
__u8 reserved1; __u16 reserved1;
__u8 reserved2;
__be32 framingCapability; __be32 framingCapability;
__be32 bearerCapability; __be32 bearerCapability;
__be16 maxChannels; __be16 maxChannels;
@ -143,6 +142,8 @@ struct PptpStartSessionReply {
struct PptpStopSessionRequest { struct PptpStopSessionRequest {
__u8 reason; __u8 reason;
__u8 reserved1;
__u16 reserved2;
}; };
/* PptpStopSessionResultCode */ /* PptpStopSessionResultCode */
@ -152,6 +153,7 @@ struct PptpStopSessionRequest {
struct PptpStopSessionReply { struct PptpStopSessionReply {
__u8 resultCode; __u8 resultCode;
__u8 generalErrorCode; __u8 generalErrorCode;
__u16 reserved1;
}; };
struct PptpEchoRequest { struct PptpEchoRequest {
@ -188,9 +190,8 @@ struct PptpOutCallRequest {
__be32 framingType; __be32 framingType;
__be16 packetWindow; __be16 packetWindow;
__be16 packetProcDelay; __be16 packetProcDelay;
__u16 reserved1;
__be16 phoneNumberLength; __be16 phoneNumberLength;
__u16 reserved2; __u16 reserved1;
__u8 phoneNumber[64]; __u8 phoneNumber[64];
__u8 subAddress[64]; __u8 subAddress[64];
}; };

2
net/ipv4/netfilter/ip_conntrack_helper_pptp.c
View file

@ -569,7 +569,7 @@ pptp_outbound_pkt(struct sk_buff **pskb,
case PPTP_OUT_CALL_REQUEST: case PPTP_OUT_CALL_REQUEST:
if (reqlen < sizeof(_pptpReq.ocreq)) { if (reqlen < sizeof(_pptpReq.ocreq)) {
DEBUGP("%s: short packet\n", pptp_msg_name[msg]); DEBUGP("%s: short packet\n", pptp_msg_name[msg]);
/* FIXME: break; */ break;
} }
/* client initiating connection to server */ /* client initiating connection to server */