mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-29 03:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

sockets: fix bug #63898: allow socket option IPV6_CHECKSUM for both IPPROTO_IPV6 and IPPROTO_RAW

Browse Source 
See bug #63898
This commit is contained in:
Simon Goldschmidt 2023-10-10 22:27:03 +02:00
parent c8d9adde0f
commit 7fd1350802
1 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/api/sockets.c
View File

@ -2920,6 +2920,49 @@ lwip_sockopt_to_ipopt(int optname)
} }
} }
#if LWIP_IPV6 && LWIP_RAW
static void
lwip_getsockopt_impl_ipv6_checksum(int s, struct lwip_sock* sock, void* optval)
{
if (sock->conn->pcb.raw->chksum_reqd == 0) {
*(int*)optval = -1;
}
else {
*(int*)optval = sock->conn->pcb.raw->chksum_offset;
}
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_RAW, IPV6_CHECKSUM) = %d\n",
s, (*(int*)optval)));
}
static int
lwip_setsockopt_impl_ipv6_checksum(int s, struct lwip_sock* sock, const void* optval, socklen_t optlen)
{
/* It should not be possible to disable the checksum generation with ICMPv6
* as per RFC 3542 chapter 3.1 */
if (sock->conn->pcb.raw->protocol == IPPROTO_ICMPV6) {
done_socket(sock);
return EINVAL;
}
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_RAW);
if (*(const int*)optval < 0) {
sock->conn->pcb.raw->chksum_reqd = 0;
}
else if (*(const int*)optval & 1) {
/* Per RFC3542, odd offsets are not allowed */
done_socket(sock);
return EINVAL;
}
else {
sock->conn->pcb.raw->chksum_reqd = 1;
sock->conn->pcb.raw->chksum_offset = (u16_t) * (const int*)optval;
}
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_RAW, IPV6_CHECKSUM, ..) -> %d\n",
s, sock->conn->pcb.raw->chksum_reqd));
return 0;
}
#endif
/** lwip_getsockopt_impl: the actual implementation of getsockopt: /** lwip_getsockopt_impl: the actual implementation of getsockopt:
* same argument as lwip_getsockopt, either called directly or through callback * same argument as lwip_getsockopt, either called directly or through callback
*/ */
@ -3169,6 +3212,12 @@ lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *opt
/* Level: IPPROTO_IPV6 */ /* Level: IPPROTO_IPV6 */
case IPPROTO_IPV6: case IPPROTO_IPV6:
switch (optname) { switch (optname) {
#if LWIP_IPV6 && LWIP_RAW
case IPV6_CHECKSUM:
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, *optlen, int, NETCONN_RAW);
lwip_getsockopt_impl_ipv6_checksum(s, sock, optval);
break;
#endif /* LWIP_IPV6 && LWIP_RAW */
case IPV6_V6ONLY: case IPV6_V6ONLY:
LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, int); LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, int);
*(int *)optval = (netconn_get_ipv6only(sock->conn) ? 1 : 0); *(int *)optval = (netconn_get_ipv6only(sock->conn) ? 1 : 0);
@ -3219,13 +3268,7 @@ lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *opt
#if LWIP_IPV6 && LWIP_RAW #if LWIP_IPV6 && LWIP_RAW
case IPV6_CHECKSUM: case IPV6_CHECKSUM:
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, *optlen, int, NETCONN_RAW); LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, *optlen, int, NETCONN_RAW);
if (sock->conn->pcb.raw->chksum_reqd == 0) { lwip_getsockopt_impl_ipv6_checksum(s, sock, optval);
*(int *)optval = -1;
} else {
*(int *)optval = sock->conn->pcb.raw->chksum_offset;
}
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_RAW, IPV6_CHECKSUM) = %d\n",
s, (*(int *)optval)) );
break; break;
#endif /* LWIP_IPV6 && LWIP_RAW */ #endif /* LWIP_IPV6 && LWIP_RAW */
default: default:
@ -3646,6 +3689,14 @@ lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_
/* Level: IPPROTO_IPV6 */ /* Level: IPPROTO_IPV6 */
case IPPROTO_IPV6: case IPPROTO_IPV6:
switch (optname) { switch (optname) {
#if LWIP_IPV6 && LWIP_RAW
case IPV6_CHECKSUM:
err = lwip_setsockopt_impl_ipv6_checksum(s, sock, optval, optlen);
if (err) {
return err;
}
break;
#endif /* LWIP_IPV6 && LWIP_RAW */
case IPV6_V6ONLY: case IPV6_V6ONLY:
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, int); LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, int);
if (*(const int *)optval) { if (*(const int *)optval) {
@ -3744,26 +3795,10 @@ lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_
switch (optname) { switch (optname) {
#if LWIP_IPV6 && LWIP_RAW #if LWIP_IPV6 && LWIP_RAW
case IPV6_CHECKSUM: case IPV6_CHECKSUM:
/* It should not be possible to disable the checksum generation with ICMPv6 err = lwip_setsockopt_impl_ipv6_checksum(s, sock, optval, optlen);
* as per RFC 3542 chapter 3.1 */ if (err) {
if (sock->conn->pcb.raw->protocol == IPPROTO_ICMPV6) { return err;
done_socket(sock);
return EINVAL;
} }
LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_RAW);
if (*(const int *)optval < 0) {
sock->conn->pcb.raw->chksum_reqd = 0;
} else if (*(const int *)optval & 1) {
/* Per RFC3542, odd offsets are not allowed */
done_socket(sock);
return EINVAL;
} else {
sock->conn->pcb.raw->chksum_reqd = 1;
sock->conn->pcb.raw->chksum_offset = (u16_t) * (const int *)optval;
}
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_RAW, IPV6_CHECKSUM, ..) -> %d\n",
s, sock->conn->pcb.raw->chksum_reqd));
break; break;
#endif /* LWIP_IPV6 && LWIP_RAW */ #endif /* LWIP_IPV6 && LWIP_RAW */
default: default: