emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: make bb_lookup_port() abort on bad port names

Browse Source 
Also, no need to preserve errno

function                                             old     new   delta
.rodata                                           104247  104241      -6
bb_lookup_port                                        97      83     -14
nc_main                                             1039    1018     -21
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-41)             Total: -41 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-09-09 22:00:44 +02:00
parent 82c5eb8e46
commit 7ab9cd2398
4 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libbb/xconnect.c
View File

@ -115,27 +115,19 @@ void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
/* Return port number for a service. /* Return port number for a service.
* If "port" is a number use it as the port. * If "port" is a number use it as the port.
* If "port" is a name it is looked up in /etc/services, * If "port" is a name it is looked up in /etc/services.
* if it isnt found return default_port * if NULL, return default_port
*/ */
unsigned FAST_FUNC bb_lookup_port(const char *port, const char *protocol, unsigned default_port) unsigned FAST_FUNC bb_lookup_port(const char *port, const char *protocol, unsigned port_nr)
{ {
unsigned port_nr = default_port;
if (port) { if (port) {
int old_errno;
/* Since this is a lib function, we're not allowed to reset errno to 0.
* Doing so could break an app that is deferring checking of errno. */
old_errno = errno;
port_nr = bb_strtou(port, NULL, 10); port_nr = bb_strtou(port, NULL, 10);
if (errno || port_nr > 65535) { if (errno || port_nr > 65535) {
struct servent *tserv = getservbyname(port, protocol); struct servent *tserv = getservbyname(port, protocol);
port_nr = default_port; if (!tserv)
if (tserv) bb_error_msg_and_die("bad port '%s'", port);
port_nr = ntohs(tserv->s_port); port_nr = ntohs(tserv->s_port);
//FIXME: else: port string was garbage, but we don't report that???
} }
errno = old_errno;
} }
return (uint16_t)port_nr; return (uint16_t)port_nr;
} }

3
networking/ftpgetput.c
View File

@ -290,8 +290,7 @@ static const char ftpgetput_longopts[] ALIGN1 =
int ftpgetput_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ftpgetput_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ftpgetput_main(int argc UNUSED_PARAM, char **argv) int ftpgetput_main(int argc UNUSED_PARAM, char **argv)
{ {
const char *port = "ftp"; const char *port = NULL;
/* socket to ftp server */
#if ENABLE_FTPPUT && !ENABLE_FTPGET #if ENABLE_FTPPUT && !ENABLE_FTPGET
# define ftp_action ftp_send # define ftp_action ftp_send

2
networking/nc.c
View File

@ -216,7 +216,7 @@ int nc_main(int argc, char **argv)
close(sfd); close(sfd);
} else { } else {
cfd = create_and_connect_stream_or_die(argv[0], cfd = create_and_connect_stream_or_die(argv[0],
argv[1] ? bb_lookup_port(argv[1], "tcp", 0) : 0); bb_lookup_port(argv[1], "tcp", 0));
} }
} }

7
networking/nc_bloaty.c
View File

@ -813,8 +813,6 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
//if (option_mask32 & OPT_o) /* hexdump log */ //if (option_mask32 & OPT_o) /* hexdump log */
if (option_mask32 & OPT_p) { /* local source port */ if (option_mask32 & OPT_p) { /* local source port */
o_lport = bb_lookup_port(str_p, o_udpmode ? "udp" : "tcp", 0); o_lport = bb_lookup_port(str_p, o_udpmode ? "udp" : "tcp", 0);
if (!o_lport)
bb_error_msg_and_die("bad local port '%s'", str_p);
} }
//if (option_mask32 & OPT_r) /* randomize various things */ //if (option_mask32 & OPT_r) /* randomize various things */
//if (option_mask32 & OPT_u) /* use UDP */ //if (option_mask32 & OPT_u) /* use UDP */
@ -827,9 +825,8 @@ int nc_main(int argc UNUSED_PARAM, char **argv)
if (argv[0]) { if (argv[0]) {
themaddr = xhost2sockaddr(argv[0], themaddr = xhost2sockaddr(argv[0],
argv[1] bb_lookup_port(argv[1], o_udpmode ? "udp" : "tcp", 0)
? bb_lookup_port(argv[1], o_udpmode ? "udp" : "tcp", 0) );
: 0);
} }
/* create & bind network socket */ /* create & bind network socket */