[NETFILTER]: PPTP conntrack: fix header definitions

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>

1 files changed, 5 insertions, 4 deletions

diff --git a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
index 0d35623f9453..620bf06fabc2 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
@@ -107,8 +107,7 @@ struct PptpControlHeader {
 
 struct PptpStartSessionRequest {
         __be16  protocolVersion;
-        __u8    reserved1;
-        __u8    reserved2;
+        __u16   reserved1;
         __be32  framingCapability;
         __be32  bearerCapability;
         __be16  maxChannels;
@@ -143,6 +142,8 @@ struct PptpStartSessionReply {
 
 struct PptpStopSessionRequest {
         __u8    reason;
+        __u8    reserved1;
+        __u16   reserved2;
 };
 
 /* PptpStopSessionResultCode */
@@ -152,6 +153,7 @@ struct PptpStopSessionRequest {
 struct PptpStopSessionReply {
         __u8    resultCode;
         __u8    generalErrorCode;
+        __u16   reserved1;
 };
 
 struct PptpEchoRequest {
@@ -188,9 +190,8 @@ struct PptpOutCallRequest {
         __be32  framingType;
         __be16  packetWindow;
         __be16  packetProcDelay;
-        __u16   reserved1;
         __be16  phoneNumberLength;
-        __u16   reserved2;
+        __u16   reserved1;
         __u8    phoneNumber[64];
         __u8    subAddress[64];
 };