bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-01-08 22:12:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes: ioctl-intp, -T hang, mixed directions, socat_open sprintf overflow

Browse source
This commit is contained in:
Gerhard Rieger 2015-04-03 15:12:38 +02:00
parent 8a77b35b87
commit e89ced5b06
3 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -223,6 +223,11 @@ corrections:
simulated by appropriate setting. simulated by appropriate setting.
Thanks to Youfu Zhang for reporting issue with option raw. Thanks to Youfu Zhang for reporting issue with option raw.
ioctl-intp
-T hang
mixed directions
socat_open sprintf overflow
porting: porting:
Red Hat issue 1020203: configure checks fail with some compilers. Red Hat issue 1020203: configure checks fail with some compilers.
Use case: clang Use case: clang

4
xioengine.c
View file

@ -159,6 +159,8 @@ int _socat(xiofile_t *xfd1, xiofile_t *xfd2) {
if (total_timeout.tv_sec < 0 || if (total_timeout.tv_sec < 0 ||
total_timeout.tv_sec == 0 && total_timeout.tv_usec < 0) { total_timeout.tv_sec == 0 && total_timeout.tv_usec < 0) {
Notice("inactivity timeout triggered"); Notice("inactivity timeout triggered");
xioclose(sock1);
xioclose(sock2);
free(buff); free(buff);
return 0; return 0;
} }
@ -314,6 +316,8 @@ int _socat(xiofile_t *xfd1, xiofile_t *xfd2) {
xioparams->total_timeout.tv_usec != 0) { xioparams->total_timeout.tv_usec != 0) {
/* there was a total inactivity timeout */ /* there was a total inactivity timeout */
Notice("inactivity timeout triggered"); Notice("inactivity timeout triggered");
xioclose(sock1);
xioclose(sock2);
free(buff); free(buff);
return 0; return 0;
} }

33
xioopen.c
View file

@ -655,7 +655,7 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
case XIOCOMM_SOCKETPAIR: case XIOCOMM_SOCKETPAIR:
case XIOCOMM_SOCKETPAIRS: case XIOCOMM_SOCKETPAIRS:
if (xiocommpair(xioopts.pipetype, if (xiocommpair(xioopts.pipetype,
(rw0+1)&(XIO_WRONLY+1), (rw0+1)&(XIO_RDONLY+1), (rw2+1)&(XIO_WRONLY+1), (rw1+1)&(XIO_WRONLY+1),
sfdB!=0, &left, &right, sfdB!=0, &left, &right,
PF_UNIX, SOCK_STREAM, 0) != 0) { PF_UNIX, SOCK_STREAM, 0) != 0) {
return NULL; return NULL;
@ -664,7 +664,7 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
case XIOCOMM_PTY: case XIOCOMM_PTY:
case XIOCOMM_PTYS: case XIOCOMM_PTYS:
if (xiocommpair(xioopts.pipetype, if (xiocommpair(xioopts.pipetype,
(rw0+1)&(XIO_WRONLY+1), (rw0+1)&(XIO_RDONLY+1), (rw2+1)&(XIO_WRONLY+1), (rw1+1)&(XIO_WRONLY+1),
sfdB!=0, &left, &right, sfdB!=0, &left, &right,
1 /* useptmx */) != 0) { 1 /* useptmx */) != 0) {
return NULL; return NULL;
@ -672,7 +672,7 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
break; break;
default: default:
if (xiocommpair(xioopts.pipetype, if (xiocommpair(xioopts.pipetype,
(rw0+1)&(XIO_WRONLY+1), (rw0+1)&(XIO_RDONLY+1), (rw2+1)&(XIO_WRONLY+1), (rw1+1)&(XIO_WRONLY+1),
sfdB!=0, &left, &right) != 0) { sfdB!=0, &left, &right) != 0) {
return NULL; return NULL;
} }
@ -687,12 +687,13 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
/* dual implies (rw0==rw1==XIO_RDWR) */ /* dual implies (rw0==rw1==XIO_RDWR) */
if (!reverseA) { if (!reverseA) {
/* A is not reverse, but B */ /* A is not reverse, but B */
char addr[15]; # define MAXADDR 45
char addr[MAXADDR];
xfd0 = xioallocfd(); xfd0 = xioallocfd();
xioopen_makedual(xfd0); xioopen_makedual(xfd0);
xfd0->dual.stream[1] = sfdA; xfd0->dual.stream[1] = sfdA;
sprintf(addr, "FD:%u", /*0 righttoleft[0]*/left.rfd); snprintf(addr, MAXADDR, "FD:%u", /*0 righttoleft[0]*/left.rfd);
if ((xfd0->dual.stream[0] = if ((xfd0->dual.stream[0] =
(xiosingle_t *)socat_open(addr, XIO_WRONLY, 0)) (xiosingle_t *)socat_open(addr, XIO_WRONLY, 0))
== NULL) { == NULL) {
@ -703,7 +704,7 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
xfd1 = xioallocfd(); xfd1 = xioallocfd();
xioopen_makedual(xfd1); xioopen_makedual(xfd1);
xfd1->dual.stream[1] = sfdB; xfd1->dual.stream[1] = sfdB;
sprintf(addr, "FD:%u", /*0 lefttoright[0]*/right.rfd); snprintf(addr, MAXADDR, "FD:%u", /*0 lefttoright[0]*/right.rfd);
if ((xfd1->dual.stream[0] = if ((xfd1->dual.stream[0] =
(xiosingle_t *)socat_open(addr, XIO_RDONLY, 0)) (xiosingle_t *)socat_open(addr, XIO_RDONLY, 0))
== NULL) { == NULL) {
@ -712,12 +713,12 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
} }
} else { } else {
/* A is reverse, but B is not */ /* A is reverse, but B is not */
char addr[15]; char addr[MAXADDR];
xfd0 = xioallocfd(); xfd0 = xioallocfd();
xioopen_makedual(xfd0); xioopen_makedual(xfd0);
xfd0->dual.stream[0] = sfdB; xfd0->dual.stream[0] = sfdB;
sprintf(addr, "FD:%u", /*0 lefttoright[1]*/left.wfd); snprintf(addr, MAXADDR, "FD:%u", /*0 lefttoright[1]*/left.wfd);
if ((xfd0->dual.stream[1] = if ((xfd0->dual.stream[1] =
(xiosingle_t *)socat_open(addr, XIO_RDONLY, 0)) (xiosingle_t *)socat_open(addr, XIO_RDONLY, 0))
== NULL) { == NULL) {
@ -727,7 +728,7 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
xfd1 = xioallocfd(); xfd1 = xioallocfd();
xioopen_makedual(xfd1); xioopen_makedual(xfd1);
xfd1->dual.stream[0] = sfdA; xfd1->dual.stream[0] = sfdA;
sprintf(addr, "FD:%u", /*0 righttoleft[1]*/right.wfd); snprintf(addr, MAXADDR, "FD:%u", /*0 righttoleft[1]*/right.wfd);
if ((xfd1->dual.stream[1] = if ((xfd1->dual.stream[1] =
(xiosingle_t *)socat_open(addr, XIO_RDONLY, 0)) (xiosingle_t *)socat_open(addr, XIO_RDONLY, 0))
== NULL) { == NULL) {
@ -743,7 +744,7 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
} else { } else {
/* either dual with equal directions, or non-dual */ /* either dual with equal directions, or non-dual */
xiofile_t *tfd; /* temp xfd */ xiofile_t *tfd; /* temp xfd */
char addr[15]; char addr[MAXADDR];
if (sfdB != NULL) { if (sfdB != NULL) {
/* dual, none or both are reverse */ /* dual, none or both are reverse */
tfd = xioallocfd(); tfd = xioallocfd();
@ -760,11 +761,11 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
/* forward */ /* forward */
xfd0 = tfd; xfd0 = tfd;
if (rw1 == XIO_RDWR) { if (rw1 == XIO_RDWR) {
sprintf(addr, "FD:%u:%u", /*0 righttoleft[1]*/right.wfd, /*0 lefttoright[0]*/right.rfd); snprintf(addr, MAXADDR, "FD:%u:%u", /*0 righttoleft[1]*/right.wfd, /*0 lefttoright[0]*/right.rfd);
} else if (rw1 == XIO_RDONLY) { } else if (rw1 == XIO_RDONLY) {
sprintf(addr, "FD:%u", /*0 lefttoright[0]*/right.rfd); snprintf(addr, MAXADDR, "FD:%u", /*0 lefttoright[0]*/right.rfd);
} else { } else {
sprintf(addr, "FD:%u", /*0 righttoleft[1]*/right.wfd); snprintf(addr, MAXADDR, "FD:%u", /*0 righttoleft[1]*/right.wfd);
} }
if ((xfd1 = socat_open(addr, rw1, 0)) == NULL) { if ((xfd1 = socat_open(addr, rw1, 0)) == NULL) {
xiofreefd(xfd0); xiofreefd(xfd2); xiofreefd(xfd0); xiofreefd(xfd2);
@ -774,11 +775,11 @@ xiofile_t *socat_open(const char *addrs0, int rw, int flags) {
/* reverse */ /* reverse */
xfd1 = tfd; xfd1 = tfd;
if (rw0 == XIO_RDWR) { if (rw0 == XIO_RDWR) {
sprintf(addr, "FD:%u:%u", /*0 lefttoright[1]*/left.wfd, /*0 righttoleft[0]*/left.rfd); snprintf(addr, MAXADDR, "FD:%u:%u", /*0 lefttoright[1]*/left.wfd, /*0 righttoleft[0]*/left.rfd);
} else if (rw0 == XIO_RDONLY) { } else if (rw0 == XIO_RDONLY) {
sprintf(addr, "FD:%u", /*0 righttoleft[0]*/left.rfd); snprintf(addr, MAXADDR, "FD:%u", /*0 righttoleft[0]*/left.rfd);
} else { } else {
sprintf(addr, "FD:%u", /*0 lefttoright[1]*/left.wfd); snprintf(addr, MAXADDR, "FD:%u", /*0 lefttoright[1]*/left.wfd);
} }
if ((xfd0 = socat_open(addr, rw0/*0 XIO_RDWR*/, 0)) == NULL) { if ((xfd0 = socat_open(addr, rw0/*0 XIO_RDWR*/, 0)) == NULL) {
xiofreefd(xfd1); xiofreefd(xfd2); xiofreefd(xfd1); xiofreefd(xfd2);