diff options
| author | Loganaden Velvindron <logan@cvs.openbsd.org> | 2015-11-16 06:13:05 +0000 |
|---|---|---|
| committer | Loganaden Velvindron <logan@cvs.openbsd.org> | 2015-11-16 06:13:05 +0000 |
| commit | 24c8dca50b88192c56f682f2e41053a8e17d57e5 (patch) | |
| tree | 12bea9afb97496754748a9bf4128dbf1ed33b07f /usr.bin/ssh | |
| parent | 6945de87296246a208d4d8aa2a730df481731007 (diff) | |
1) Use xcalloc() instead of xmalloc() to check for potential overflow.
(Feedback from both mmcc@ and djm@)
2) move set_size just before the for loop. (suggested by djm@)
OK djm@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/sftp-server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c index e0ad3e33f44..19fbeaa85a6 100644 --- a/usr.bin/ssh/sftp-server.c +++ b/usr.bin/ssh/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.107 2015/08/20 22:32:42 deraadt Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.108 2015/11/16 06:13:04 logan Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -1584,9 +1584,8 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) if ((oqueue = sshbuf_new()) == NULL) fatal("%s: sshbuf_new failed", __func__); - set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); - rset = xmalloc(set_size); - wset = xmalloc(set_size); + rset = xcalloc(howmany(max + 1, NFDBITS), sizeof(fd_mask)); + wset = xcalloc(howmany(max + 1, NFDBITS), sizeof(fd_mask)); if (homedir != NULL) { if (chdir(homedir) != 0) { @@ -1595,6 +1594,7 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) } } + set_size = howmany(max + 1, NFDBITS) * sizeof(fd_mask); for (;;) { memset(rset, 0, set_size); memset(wset, 0, set_size); |