Skip to contentSkip to conversation

PPTP NAT helper fix

PATCH In review Holger Eitzenberger 2 participants 3 messages Jan 24, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi,

what follows is a patch for PPT NAT helper as of kernel version 2.6.15.1.

Please apply.

Thanks. /holger

#1 lore raw

PATCH 1/1 Fix CID offset bug in PPTP NAT helper

The recent (kernel 2.6.15.1) fix for PPTP NAT helper introduced a bug - which only appears if DEBUGP is enabled though.

The calculation of the CID offset into a PPTP request struct is not correct, so that at least not the correct CID is displayed if DEBUGP is enabled.

This patch corrects CID offset calculation and introduces a #define for that.

---

 net/ipv4/netfilter/ip_nat_helper_pptp.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

b4a2c7646fb828e47b2f6ed8c7794155204a97a9

net/ipv4/netfilter/ip_nat_helper_pptp.c +6 -3
index 50960cb..8fe3e34 100644
@@ -52,6 +52,9 @@
 
 #define IP_NAT_PPTP_VERSION "3.0"
 
+#define REQ_CID(req, off)		(*(u_int16_t *)((char *)(req) + (off)))
+
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <[email protected]>");
 MODULE_DESCRIPTION("Netfilter NAT helper module for PPTP");
@@ -198,7 +201,7 @@ pptp_outbound_pkt(struct sk_buff **pskb,
 	/* only OUT_CALL_REQUEST, IN_CALL_REPLY, CALL_CLEAR_REQUEST pass
 	 * down to here */
 	DEBUGP("altering call id from 0x%04x to 0x%04x\n",
-		ntohs(*(u_int16_t *)pptpReq + cid_off), ntohs(new_callid));
+		ntohs(REQ_CID(pptpReq, cid_off)), ntohs(new_callid));
 
 	/* mangle packet */
 	if (ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
@@ -344,7 +347,7 @@ pptp_inbound_pkt(struct sk_buff **pskb,
 
 	/* mangle packet */
 	DEBUGP("altering peer call id from 0x%04x to 0x%04x\n",
-		ntohs(*(u_int16_t *)pptpReq + pcid_off), ntohs(new_pcid));
+		ntohs(REQ_CID(pptpReq, pcid_off)), ntohs(new_pcid));
 	
 	rv = ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
 	                              pcid_off + sizeof(struct pptp_pkt_hdr) +
@@ -356,7 +359,7 @@ pptp_inbound_pkt(struct sk_buff **pskb,
 
 	if (new_cid) {
 		DEBUGP("altering call id from 0x%04x to 0x%04x\n",
-			ntohs(*(u_int16_t *)pptpReq + cid_off), ntohs(new_cid));
+			ntohs(REQ_CID(pptpReq, cid_off)), ntohs(new_cid));
 		rv = ip_nat_mangle_tcp_packet(pskb, ct, ctinfo,
 		                              cid_off + sizeof(struct pptp_pkt_hdr) +
 					      sizeof(struct PptpControlHeader),
Signature · 1 line
1.0.GIT
#2 lore raw

Re: [PATCH] [NETFILTER] Fix CID offset bug in PPTP NAT helper

Quoted 9 lines · Holger Eitzenberger

The recent (kernel 2.6.15.1) fix for PPTP NAT helper introduced a bug - which only appears if DEBUGP is enabled though.

The calculation of the CID offset into a PPTP request struct is not correct, so that at least not the correct CID is displayed if DEBUGP is enabled.

This patch corrects CID offset calculation and introduces a #define for that.

That was my bad. Patch applied, thanks.