michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: wncm14a2a: fix RX socket src/dst port assignment

Browse source 
Source and destination ports should be set properly
when assembling the receive socket data.

Signed-off-by: Ryan Erickson <ryan.erickson@lairdconnect.com>
This commit is contained in:
Ryan Erickson 2020-03-12 16:08:39 -05:00 • committed by Carles Cufí
commit 6a625c371f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/modem/wncm14a2a.c
View file

@ -478,6 +478,8 @@ static int pkt_setup_ip_data(struct net_pkt *pkt,
&((struct sockaddr_in6 *)&sock->src)->sin6_addr)) { &((struct sockaddr_in6 *)&sock->src)->sin6_addr)) {
return -1; return -1;
} }
src_port = ntohs(net_sin6(&sock->src)->sin6_port);
dst_port = ntohs(net_sin6(&sock->dst)->sin6_port);
hdr_len = sizeof(struct net_ipv6_hdr); hdr_len = sizeof(struct net_ipv6_hdr);
} else } else
@ -490,6 +492,8 @@ static int pkt_setup_ip_data(struct net_pkt *pkt,
&((struct sockaddr_in *)&sock->src)->sin_addr)) { &((struct sockaddr_in *)&sock->src)->sin_addr)) {
return -1; return -1;
} }
src_port = ntohs(net_sin(&sock->src)->sin_port);
dst_port = ntohs(net_sin(&sock->dst)->sin_port);
hdr_len = sizeof(struct net_ipv4_hdr); hdr_len = sizeof(struct net_ipv4_hdr);
} else } else
@ -500,7 +504,7 @@ static int pkt_setup_ip_data(struct net_pkt *pkt,
#if defined(CONFIG_NET_UDP) #if defined(CONFIG_NET_UDP)
if (sock->ip_proto == IPPROTO_UDP) { if (sock->ip_proto == IPPROTO_UDP) {
if (net_udp_create(pkt, src_port, dst_port)) { if (net_udp_create(pkt, dst_port, src_port)) {
return -1; return -1;
} }
@ -520,8 +524,8 @@ static int pkt_setup_ip_data(struct net_pkt *pkt,
(void)memset(tcp, 0, NET_TCPH_LEN); (void)memset(tcp, 0, NET_TCPH_LEN);
/* Setup TCP header */ /* Setup TCP header */
tcp->src_port = src_port; tcp->src_port = dst_port;
tcp->dst_port = dst_port; tcp->dst_port = src_port;
if (net_pkt_set_data(pkt, &tcp_access)) { if (net_pkt_set_data(pkt, &tcp_access)) {
return -1; return -1;