mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-02 12:52:10 +00:00
sockets.c: fixed bug #25051: lwip_recvfrom problem with udp: fromaddr and port uses deleted netbuf.
This commit is contained in:
parent
6777ae2ada
commit
411cb39eb4
@ -56,6 +56,10 @@ HISTORY
|
|||||||
|
|
||||||
++ Bugfixes:
|
++ Bugfixes:
|
||||||
|
|
||||||
|
2008-12-10 Tamas Somogyi, Frédéric Bernon
|
||||||
|
* sockets.c: fixed bug #25051: lwip_recvfrom problem with udp: fromaddr and
|
||||||
|
port uses deleted netbuf.
|
||||||
|
|
||||||
2008-10-18 Simon Goldschmidt
|
2008-10-18 Simon Goldschmidt
|
||||||
* tcp_in.c: fixed bug ##24596: Vulnerability on faulty TCP options length
|
* tcp_in.c: fixed bug ##24596: Vulnerability on faulty TCP options length
|
||||||
in tcp_parseopt
|
in tcp_parseopt
|
||||||
|
@ -530,34 +530,15 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
|
|||||||
|
|
||||||
if (netconn_type(sock->conn) == NETCONN_TCP) {
|
if (netconn_type(sock->conn) == NETCONN_TCP) {
|
||||||
len -= copylen;
|
len -= copylen;
|
||||||
if ( (len <= 0) || (buf->p->flags & PBUF_FLAG_PUSH) || !sock->rcvevent) {
|
if ( (len <= 0) || (buf->p->flags & PBUF_FLAG_PUSH) || !sock->rcvevent || ((flags & MSG_PEEK)!=0)) {
|
||||||
done = 1;
|
done = 1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
done = 1;
|
done = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we don't peek the incoming message... */
|
|
||||||
if ((flags & MSG_PEEK)==0) {
|
|
||||||
/* If this is a TCP socket, check if there is data left in the
|
|
||||||
buffer. If so, it should be saved in the sock structure for next
|
|
||||||
time around. */
|
|
||||||
if ((sock->conn->type == NETCONN_TCP) && (buflen - copylen > 0)) {
|
|
||||||
sock->lastdata = buf;
|
|
||||||
sock->lastoffset += copylen;
|
|
||||||
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: lastdata now netbuf=%p\n", (void*)buf));
|
|
||||||
} else {
|
|
||||||
sock->lastdata = NULL;
|
|
||||||
sock->lastoffset = 0;
|
|
||||||
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: deleting netbuf=%p\n", (void*)buf));
|
|
||||||
netbuf_delete(buf);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
done = 1;
|
|
||||||
}
|
|
||||||
} while (!done);
|
|
||||||
|
|
||||||
/* Check to see from where the data was.*/
|
/* Check to see from where the data was.*/
|
||||||
|
if (done) {
|
||||||
if (from && fromlen) {
|
if (from && fromlen) {
|
||||||
struct sockaddr_in sin;
|
struct sockaddr_in sin;
|
||||||
|
|
||||||
@ -575,8 +556,9 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
|
|||||||
sin.sin_port = htons(port);
|
sin.sin_port = htons(port);
|
||||||
sin.sin_addr.s_addr = addr->addr;
|
sin.sin_addr.s_addr = addr->addr;
|
||||||
|
|
||||||
if (*fromlen > sizeof(sin))
|
if (*fromlen > sizeof(sin)) {
|
||||||
*fromlen = sizeof(sin);
|
*fromlen = sizeof(sin);
|
||||||
|
}
|
||||||
|
|
||||||
SMEMCPY(from, &sin, *fromlen);
|
SMEMCPY(from, &sin, *fromlen);
|
||||||
|
|
||||||
@ -600,6 +582,25 @@ lwip_recvfrom(int s, void *mem, int len, unsigned int flags,
|
|||||||
LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%u len=%u\n", port, off));
|
LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%u len=%u\n", port, off));
|
||||||
#endif /* SOCKETS_DEBUG */
|
#endif /* SOCKETS_DEBUG */
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* If we don't peek the incoming message... */
|
||||||
|
if ((flags & MSG_PEEK)==0) {
|
||||||
|
/* If this is a TCP socket, check if there is data left in the
|
||||||
|
buffer. If so, it should be saved in the sock structure for next
|
||||||
|
time around. */
|
||||||
|
if ((netconn_type(sock->conn) == NETCONN_TCP) && (buflen - copylen > 0)) {
|
||||||
|
sock->lastdata = buf;
|
||||||
|
sock->lastoffset += copylen;
|
||||||
|
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: lastdata now netbuf=%p\n", (void*)buf));
|
||||||
|
} else {
|
||||||
|
sock->lastdata = NULL;
|
||||||
|
sock->lastoffset = 0;
|
||||||
|
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: deleting netbuf=%p\n", (void*)buf));
|
||||||
|
netbuf_delete(buf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} while (!done);
|
||||||
|
|
||||||
sock_set_errno(sock, 0);
|
sock_set_errno(sock, 0);
|
||||||
return off;
|
return off;
|
||||||
|
Loading…
Reference in New Issue
Block a user