diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2009-06-14 16:25:26 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-06-14 16:25:26 +0000 |
commit | 49db7b428a4752749fb421bfbe50946cafa2fc3f (patch) | |
tree | 66b2225fa378df22ad147c278b9b94110a22c3c2 | |
parent | a7c513d8dc2f4dc2f9a7ae91736f2f2870f2c892 (diff) |
Fix type of length argument to sockset syscalls.
Various socket syscalls receive a length argument that should be a
socklen_t rsp. a ptr to a socklen_t but instead int rsp. ptr to int were
being passed. While in theory this was a bug it's harmless as dangerously
large values would not be used but the issue manifested itself in a
significant number of compilation warnings.
-rw-r--r-- | ax25/ax25d.c | 6 | ||||
-rw-r--r-- | ax25/axspawn.c | 8 | ||||
-rw-r--r-- | ax25/mheardd.c | 2 | ||||
-rw-r--r-- | ax25/rxecho.c | 5 | ||||
-rw-r--r-- | hdlcutil/hdrvcomm.c | 2 | ||||
-rw-r--r-- | netrom/netromd.c | 2 | ||||
-rw-r--r-- | rose/rsdwnlnk.c | 3 | ||||
-rw-r--r-- | rose/rsuplnk.c | 3 | ||||
-rw-r--r-- | tcpip/rip98r.c | 3 | ||||
-rw-r--r-- | tcpip/ttylinkd.c | 4 |
10 files changed, 22 insertions, 16 deletions
diff --git a/ax25/ax25d.c b/ax25/ax25d.c index 2bbf388..63ec5d2 100644 --- a/ax25/ax25d.c +++ b/ax25/ax25d.c @@ -1,5 +1,5 @@ /* - * $Id: ax25d.c,v 1.6 2009/06/14 08:06:06 ralf Exp $ + * $Id: ax25d.c,v 1.7 2009/06/14 16:25:26 ralf Exp $ * * This is my version of axl.c, written for the LBBS code to make it * compatable with the kernel AX25 driver. It appears to work, with @@ -274,7 +274,7 @@ int main(int argc, char *argv[]) struct sockaddr_rose rose; } sockaddr; struct sigaction act, oact; - int addrlen; + socklen_t addrlen; int cnt; char buf[1024]; char *p; @@ -816,7 +816,7 @@ static int ReadConfig(void) char buffer[2048]; char *s, *port, *call, *node, *addr = NULL; unsigned long val; - int addrlen; + socklen_t addrlen; int af_type = 0; /* Keep GCC happy */ int line = 0; int hunt = TRUE, error = FALSE; diff --git a/ax25/axspawn.c b/ax25/axspawn.c index a1af4c9..0769353 100644 --- a/ax25/axspawn.c +++ b/ax25/axspawn.c @@ -1,6 +1,6 @@ /* * - * $Id: axspawn.c,v 1.20 2009/06/14 13:27:51 ralf Exp $ + * $Id: axspawn.c,v 1.21 2009/06/14 16:25:26 ralf Exp $ * * axspawn.c - run a program from ax25d. * @@ -1046,7 +1046,8 @@ void new_user(char *newuser) char buf[4096]; char subdir[4]; int cnt; - unsigned char *p, *q; + unsigned char *q; + char *p; struct stat fst; int fd_a, fd_b, fd_l; mode_t homedir_mode = S_IRUSR|S_IWUSR|S_IXUSR|S_IXOTH|(secure_home ? 0 : (S_IRGRP|S_IXGRP)); @@ -1343,7 +1344,8 @@ int main(int argc, char **argv) { char call[20], user[20], as_user[20]; char buf[2048]; - int k, cnt, digits, letters, invalid, ssid, ssidcnt, addrlen; + int k, cnt, digits, letters, invalid, ssid, ssidcnt; + socklen_t addrlen; struct timeval tv; pid_t pid = -1; char *p; diff --git a/ax25/mheardd.c b/ax25/mheardd.c index 3de25ea..31f9f64 100644 --- a/ax25/mheardd.c +++ b/ax25/mheardd.c @@ -117,7 +117,7 @@ int main(int argc, char **argv) int size, s; char *port = NULL; struct sockaddr sa; - int asize; + socklen_t asize; long position; int ctlen, type, end, extseq, flush = FALSE; FILE *fp; diff --git a/ax25/rxecho.c b/ax25/rxecho.c index 525e098..e299f2c 100644 --- a/ax25/rxecho.c +++ b/ax25/rxecho.c @@ -369,7 +369,7 @@ int main(int argc, char **argv) #ifdef USE_SOCKADDR_SLL struct sockaddr_ll sll; struct sockaddr *psa = (struct sockaddr *)&sll; - const int sa_len = sizeof(struct sockaddr_ll); + const socklen_t sa_len = sizeof(struct sockaddr_ll); int from_idx; #else #ifdef USE_SOCKADDR_SPKT @@ -383,7 +383,8 @@ int main(int argc, char **argv) #endif char from_dev_name[sizeof(psa->sa_data)]; #endif - int s, size, alen; + int s, size; + socklen_t alen; unsigned char buf[1500]; struct config *p, *list; diff --git a/hdlcutil/hdrvcomm.c b/hdlcutil/hdrvcomm.c index 776c66d..7392d4e 100644 --- a/hdlcutil/hdrvcomm.c +++ b/hdlcutil/hdrvcomm.c @@ -102,7 +102,7 @@ int hdrvc_recvpacket(char *pkt, int maxlen) { struct ifreq ifr_new; struct sockaddr_ll from; - int from_len = sizeof(from); + socklen_t from_len = sizeof(from); #ifdef HDRVC_KERNEL if (kernel_mode) { diff --git a/netrom/netromd.c b/netrom/netromd.c index 7bfa97b..0a16fd3 100644 --- a/netrom/netromd.c +++ b/netrom/netromd.c @@ -138,7 +138,7 @@ int main(int argc, char **argv) unsigned char buffer[512]; int size, s, i; struct sockaddr sa; - int asize; + socklen_t asize; struct timeval timeout; time_t timenow, timelast; int interval = 3600; diff --git a/rose/rsdwnlnk.c b/rose/rsdwnlnk.c index 45950b3..decc06d 100644 --- a/rose/rsdwnlnk.c +++ b/rose/rsdwnlnk.c @@ -35,9 +35,10 @@ int main(int argc, char **argv) { unsigned char buffer[512], *addr; fd_set read_fd; - int n = 0, s, addrlen, yes = 1; + int n = 0, s, yes = 1; struct full_sockaddr_ax25 axbind, axconnect; struct sockaddr_rose rosesock, rosepeer; + socklen_t addrlen; openlog("rsdwnlnk", LOG_PID, LOG_DAEMON); diff --git a/rose/rsuplnk.c b/rose/rsuplnk.c index c6e99dd..37c9484 100644 --- a/rose/rsuplnk.c +++ b/rose/rsuplnk.c @@ -36,7 +36,8 @@ int main(int argc, char **argv) char rose_address[11]; fd_set read_fd; int n, s, dnicindex = -1, addrindex = -1; - int addrlen, yes = 1, verbose = 1; + int yes = 1, verbose = 1; + socklen_t addrlen; struct sockaddr_rose rosebind, roseconnect; struct full_sockaddr_ax25 ax25sock, ax25peer; diff --git a/tcpip/rip98r.c b/tcpip/rip98r.c index 25cb546..9a623ff 100644 --- a/tcpip/rip98r.c +++ b/tcpip/rip98r.c @@ -82,7 +82,8 @@ void receive_routes(int s) unsigned long int netmask; unsigned long int network; int bits, metric; - int size, found, matched; + int found, matched; + socklen_t size; int mess_len; int i; diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c index 032a5bd..234b7fd 100644 --- a/tcpip/ttylinkd.c +++ b/tcpip/ttylinkd.c @@ -106,7 +106,6 @@ int main(int argc, char *argv[]) struct sockaddr_in ctl_sin; struct in_addr my_addr, rem_addr; int ctl_skt, skt, new_skt; - int length; CTL_RESPONSE resp; CTL_MSG msg; struct protoent *ppe; @@ -116,10 +115,11 @@ int main(int argc, char *argv[]) char buf[256]; char user[NAME_SIZE]; struct sockaddr sa, msg_sa; - int sa_len, i; struct sockaddr_in *peer_sin=NULL, *msg_sin; struct sockaddr_ax25 *peer_sax; struct sockaddr_rose *peer_srose; + socklen_t sa_len, length; + int i; /* Open up the system logger */ openlog(argv[0], LOG_PID, LOG_DAEMON); |