ppp: clean up endianness conversions
Subsystems (2)
PATCH 1/1 ppp: clean up endianness conversions
sparse complains about some harmless endianness issues:
Quoted 4 lines
drivers/net/ppp/pptp.c:281:21: warning: incorrect type in assignment (different base types)drivers/net/ppp/pptp.c:281:21: expected unsigned int [usertype] ackdrivers/net/ppp/pptp.c:281:21: got restricted__be32drivers/net/ppp/pptp.c:283:23: warning: cast to restricted__be32
Here 'ack' is assigned a value in network-order, and then also the byte-swapped value in host-order. Clean this up by doing the byte-swap as part of the assignment.
Quoted 4 lines
drivers/net/ppp/pptp.c:358:26: warning: cast from restricted__be16drivers/net/ppp/pptp.c:358:26: warning: incorrect type in argument 1 (different base types)drivers/net/ppp/pptp.c:358:26: expected unsigned short [usertype]call_iddrivers/net/ppp/pptp.c:358:26: got restricted__be16[usertype]
Here we use the wrong flavour of byte-swap. Use ntohs(), which of course gives the same result.
--- drivers/net/ppp/pptp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/net/ppp/pptp.c +3 -5
@@ -278,10 +278,8 @@ static int pptp_rcv_core(struct sock *sk, struct sk_buff *skb) header = (struct pptp_gre_header *)(skb->data);/* ack in different place if S = 0 */ - ack =GRE_IS_SEQ (header->gre_hd.flags) ? header->ack : header->seq; - - ack =ntohl (ack); - + ack =GRE_IS_SEQ (header->gre_hd.flags) ?ntohl (header->ack) : +ntohl (header->seq);if (ack > opt->ack_recv) opt->ack_recv = ack;/* also handle sequence number wrap-around */
@@ -355,7 +353,7 @@ static int pptp_rcv(struct sk_buff *skb)/* if invalid, discard this packet */ goto drop; - po =lookup_chan (htons (header->call_id), iph->saddr); + po =lookup_chan (ntohs (header->call_id), iph->saddr);if (po) {skb_dst_drop (skb);nf_reset_ct (skb);
Signature · 1 line
2.17.1
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Thu, 7 Jan 2021 15:39:56 +0100 you wrote:
sparse complains about some harmless endianness issues:
Quoted 4 lines
drivers/net/ppp/pptp.c:281:21: warning: incorrect type in assignment (different base types)drivers/net/ppp/pptp.c:281:21: expected unsigned int [usertype] ackdrivers/net/ppp/pptp.c:281:21: got restricted__be32drivers/net/ppp/pptp.c:283:23: warning: cast to restricted__be32[...]
Here is the summary with links:
- [net-next] ppp: clean up endianness conversions
https://git.kernel.org/netdev/net-next/c/09b5b5fb3902
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html