Menu
▾
▴
[ProFTPD-committers] [proftpd/proftpd] ce6951: Fix a possible (albeit unlikely) resource leak ide...
|
From: TJ S. <tj...@ca...> - 2014-10-15 04:39:36
|
Branch: refs/heads/master Home: https://github.com/proftpd/proftpd Commit: ce69514c0be0e273e8c7c45ba3138ff5b3bc0d5f https://github.com/proftpd/proftpd/commit/ce69514c0be0e273e8c7c45ba3138ff5b3bc0d5f Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M utils/ftptop.c Log Message: ----------- Fix a possible (albeit unlikely) resource leak identified by Coverity. Commit: 8d1bc30b395ff52e46105a0c6b0ff77032908c3c https://github.com/proftpd/proftpd/commit/8d1bc30b395ff52e46105a0c6b0ff77032908c3c Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/dirtree.c Log Message: ----------- If we encounter an error in opening a socket, make sure that we return from that function early, as appropriate (found by Coverity). Commit: f2027cd3daa410d6369b22657d67cece7fcf26c2 https://github.com/proftpd/proftpd/commit/f2027cd3daa410d6369b22657d67cece7fcf26c2 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/ctrls.c M src/log.c Log Message: ----------- Explicitly ignore the fcntl(2) return value when opening a log fd; there is no existing log fd that we can use at that point for reporting the error. Commit: 27b580fb8a3a34148bd1a0e88f6d538143969aaf https://github.com/proftpd/proftpd/commit/27b580fb8a3a34148bd1a0e88f6d538143969aaf Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/inet.c Log Message: ----------- If setting a socket back to blocking mode fails, propagate that error to the caller, just as we do when setting the socket to nonblocking mode. Found by Coverity. Commit: d837d0284981ed8166df1c5ed2ff081a703007b4 https://github.com/proftpd/proftpd/commit/d837d0284981ed8166df1c5ed2ff081a703007b4 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/data.c Log Message: ----------- Explicitly ignore the fcntl(2) return value for data sockets. Commit: feec336f2cda8a670a991802d77942bf0adc06b4 https://github.com/proftpd/proftpd/commit/feec336f2cda8a670a991802d77942bf0adc06b4 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M contrib/mod_sftp/rfc4716.c Log Message: ----------- Be more paranoid about checking return values, prompted by Coverity. Commit: 9127fd210b2945e14946732cb8c9fb4eb9ba52df https://github.com/proftpd/proftpd/commit/9127fd210b2945e14946732cb8c9fb4eb9ba52df Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/bindings.c M src/inet.c Log Message: ----------- Propagate -- and check for -- more return values, prompted by Coverity. Commit: 25489cdf0dc490c444c6495a84af4ced7975be47 https://github.com/proftpd/proftpd/commit/25489cdf0dc490c444c6495a84af4ced7975be47 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/inet.c Log Message: ----------- At least log, via trace logging, if fcntl(F_SETOWN) fails. Commit: 9e880c395d8e78fdacb0aeae0207b66a35313031 https://github.com/proftpd/proftpd/commit/9e880c395d8e78fdacb0aeae0207b66a35313031 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/inet.c Log Message: ----------- Per Coverity, make sure that we check for, and handle errors, when calling getsockopt(2). Commit: f3800e4695cb85a6aa25617ec313e2b907fea5ea https://github.com/proftpd/proftpd/commit/f3800e4695cb85a6aa25617ec313e2b907fea5ea Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/netio.c Log Message: ----------- Explicitly ignore fcntl(2) return values here. Commit: 1cb5f5f48d4b66de493c8f7191d68ca8f536a042 https://github.com/proftpd/proftpd/commit/1cb5f5f48d4b66de493c8f7191d68ca8f536a042 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M contrib/mod_sftp/agent.c Log Message: ----------- Per Coverity, at least log the fcntl(2) error when trying to set CLOEXEC on an fd opened to talk to an SSH agent. Commit: 3b505369da3402f3161ede5f35dc7d3f7e8fdf7a https://github.com/proftpd/proftpd/commit/3b505369da3402f3161ede5f35dc7d3f7e8fdf7a Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M src/fsio.c Log Message: ----------- Prompted by Coverity, log (rather than ignoring) return values. Commit: 299ab64a90080529e69bf76962484b3bccf5da31 https://github.com/proftpd/proftpd/commit/299ab64a90080529e69bf76962484b3bccf5da31 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M lib/pr-syslog.c Log Message: ----------- If we have a problem sending a message via syslog, try (at least) to report it via STDERR. Commit: 66056e048015d925bb97aa09fea35a7130724294 https://github.com/proftpd/proftpd/commit/66056e048015d925bb97aa09fea35a7130724294 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M contrib/mod_copy.c Log Message: ----------- Log, via trace logging, a should-never-fail error. Commit: 4ad5cf1649ec501fa8dc85e58ba5eea759e1a259 https://github.com/proftpd/proftpd/commit/4ad5cf1649ec501fa8dc85e58ba5eea759e1a259 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M contrib/mod_copy.c Log Message: ----------- Log, via trace logging, if we fail to add a session note. Commit: f86692959099ad605f9b30c94096b94534c430aa https://github.com/proftpd/proftpd/commit/f86692959099ad605f9b30c94096b94534c430aa Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M modules/mod_delay.c Log Message: ----------- If mod_delay has issues blocking/unblocking signals, log the reason why via trace logging. Commit: 914b1fb3c2132fcc02bd629a6b61901ed1531600 https://github.com/proftpd/proftpd/commit/914b1fb3c2132fcc02bd629a6b61901ed1531600 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M contrib/mod_sftp/kex.c Log Message: ----------- Be consistent with the datatype used for the hostkey length throughout the KEX API. Commit: f40ea1fb5a4fa747c04f92b651e3fad856528a46 https://github.com/proftpd/proftpd/commit/f40ea1fb5a4fa747c04f92b651e3fad856528a46 Author: tjsaunders <tjs...@bl...> Date: 2014-10-11 (Sat, 11 Oct 2014) Changed paths: M modules/mod_delay.c Log Message: ----------- Use proper blocks, especially when dealing with macro expansion, to make clear what is happening (and what is in scope). Commit: 8d648005dc9ba661ef5a1fd18e89df62fa893f23 https://github.com/proftpd/proftpd/commit/8d648005dc9ba661ef5a1fd18e89df62fa893f23 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_ldap.c Log Message: ----------- Remove unnecessary tertiary operator. Commit: 4edf34434f7d741335f1339f88f2c35dc80b25d5 https://github.com/proftpd/proftpd/commit/4edf34434f7d741335f1339f88f2c35dc80b25d5 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/packet.c Log Message: ----------- If mod_sftp is interrupted when reading from a socket, then retry that read(2) call again, rather than just looping infinitely. Commit: fb0d12a936e7d69c87ef24190b6536d916cf00c5 https://github.com/proftpd/proftpd/commit/fb0d12a936e7d69c87ef24190b6536d916cf00c5 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/keys.c Log Message: ----------- Copy-pasto, found by Coverity. Commit: b1b5b455409be9d6848157f1f717c6cedcad1101 https://github.com/proftpd/proftpd/commit/b1b5b455409be9d6848157f1f717c6cedcad1101 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/fxp.c Log Message: ----------- Copy-pasto, found by Coverity. Commit: 97e7ed5837211f91d390b555344b9d0290038d73 https://github.com/proftpd/proftpd/commit/97e7ed5837211f91d390b555344b9d0290038d73 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/fxp.c Log Message: ----------- Another copy-pasto found by Coverity. Commit: 4e80fbda5ab7370dd0e2f1b1cbfa9a051339f9eb https://github.com/proftpd/proftpd/commit/4e80fbda5ab7370dd0e2f1b1cbfa9a051339f9eb Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/coverity/modeling.c Log Message: ----------- Model setenv(3) as a TAINTED_DATA sink. Commit: 9112b0c03e8857dd052ad1dd0857ad851e187c4c https://github.com/proftpd/proftpd/commit/9112b0c03e8857dd052ad1dd0857ad851e187c4c Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M modules/mod_xfer.c Log Message: ----------- Per Coverity's prodding, check the return value of pr_fsio_stat(). Commit: 451f964bd0c14dcb2fcd1e4f4ea8fd5de403efa2 https://github.com/proftpd/proftpd/commit/451f964bd0c14dcb2fcd1e4f4ea8fd5de403efa2 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/fxp.c Log Message: ----------- Be sure to check the pr_table_add() return value, per Coverity. Commit: 3a02cf22ac571376c568fac44050f2d92a263e22 https://github.com/proftpd/proftpd/commit/3a02cf22ac571376c568fac44050f2d92a263e22 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/misc.c Log Message: ----------- Another place where we weren't checking pr_fsio_fstat()'s return value. Commit: e0f76e27b09ee8efbab649a0dcc4c3f3d226a476 https://github.com/proftpd/proftpd/commit/e0f76e27b09ee8efbab649a0dcc4c3f3d226a476 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/display.c M src/display.c Log Message: ----------- Make sure that pr_fsio_fstat() succeeds before setting the IO block size hint on the file handle. Commit: b57293ac7af19452f239c1e2ee0ef191193c63fe https://github.com/proftpd/proftpd/commit/b57293ac7af19452f239c1e2ee0ef191193c63fe Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M src/cmd.c Log Message: ----------- Log if we have a problem caching our "displayable" string of a command in its notes table. Commit: b581c81e288381ef4727b101b278cba8d45c754e https://github.com/proftpd/proftpd/commit/b581c81e288381ef4727b101b278cba8d45c754e Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M src/fsio.c Log Message: ----------- Restructure a function to remove dead code. Commit: 84e2e59f70a650353602674df3936a70c520a2c6 https://github.com/proftpd/proftpd/commit/84e2e59f70a650353602674df3936a70c520a2c6 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M src/str.c Log Message: ----------- Remove some redundant checks: an int cannot be larger than INT_MAX, by definition. Commit: 3e69e5921b083e23d37fcd9dbf03701702fc26b1 https://github.com/proftpd/proftpd/commit/3e69e5921b083e23d37fcd9dbf03701702fc26b1 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_radius.c Log Message: ----------- Make it clearer what the expected usage/return value of the RADIUS_IS_VAR macro is. Commit: be056ba187a1d2be3bc0a1a4459ad3551121ab53 https://github.com/proftpd/proftpd/commit/be056ba187a1d2be3bc0a1a4459ad3551121ab53 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M src/dirtree.c Log Message: ----------- Add missing break statement. Oops. Commit: 77f4bf2db600dce6b9946a319e5086ad948d100e https://github.com/proftpd/proftpd/commit/77f4bf2db600dce6b9946a319e5086ad948d100e Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_snmp/mod_snmp.c Log Message: ----------- Add missing break statement (copy-pasto). Commit: 76932a8453caeae5e493403e936878bfb69c63ec https://github.com/proftpd/proftpd/commit/76932a8453caeae5e493403e936878bfb69c63ec Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/fxp.c Log Message: ----------- As it is not possible for xerrno to be EOF in this case, remove the unneeded tertiary operator/check for that condition. Commit: 437dba2948ef7f189df7ac2d953c7dc84857434f https://github.com/proftpd/proftpd/commit/437dba2948ef7f189df7ac2d953c7dc84857434f Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sftp/fxp.c Log Message: ----------- Fix more places in mod_sftp where checking xerrno for EOF was unnecessary. Commit: a485254aaa665a28cc24e7169233cc91a1319989 https://github.com/proftpd/proftpd/commit/a485254aaa665a28cc24e7169233cc91a1319989 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M src/timers.c Log Message: ----------- Remove redundant null check. Commit: 6fd7145020da6ef21c0d393c2eed1875d3a6edf5 https://github.com/proftpd/proftpd/commit/6fd7145020da6ef21c0d393c2eed1875d3a6edf5 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_sql_passwd.c Log Message: ----------- If we have an error reading the salt, then don't proceed to trying to manipulate the buffer containing said salt. Commit: 2991d0557322ba9119cc03ea40d613f847cf6fd7 https://github.com/proftpd/proftpd/commit/2991d0557322ba9119cc03ea40d613f847cf6fd7 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/coverity/modeling.c Log Message: ----------- Model pr_session_disconnect() as a killpath. Commit: 7cf021ddc616e216509baa2f430779b2fb5aba21 https://github.com/proftpd/proftpd/commit/7cf021ddc616e216509baa2f430779b2fb5aba21 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_shaper.c Log Message: ----------- Per Coverity, avoid possible divide-by-zero situation. Commit: e0ad9e39365e75d3a394e1ce84eef2ce22fdfd44 https://github.com/proftpd/proftpd/commit/e0ad9e39365e75d3a394e1ce84eef2ce22fdfd44 Author: tjsaunders <tjs...@bl...> Date: 2014-10-12 (Sun, 12 Oct 2014) Changed paths: M contrib/mod_tls.c Log Message: ----------- More places where we need to log if there's an issue stashing a note in a table, especially these SSL notes. Commit: 5503fbd22db50e1d61b64bd7a6c01bc89db8540e https://github.com/proftpd/proftpd/commit/5503fbd22db50e1d61b64bd7a6c01bc89db8540e Author: tjsaunders <tjs...@bl...> Date: 2014-10-14 (Tue, 14 Oct 2014) Changed paths: M contrib/coverity/modeling.c Log Message: ----------- More Coverity modeling hints. Commit: 9d3b739b50c735c8ca29864b0c39b619b374648d https://github.com/proftpd/proftpd/commit/9d3b739b50c735c8ca29864b0c39b619b374648d Author: tjsaunders <tjs...@bl...> Date: 2014-10-14 (Tue, 14 Oct 2014) Changed paths: M src/stash.c Log Message: ----------- Minor edge case found by Coverity. Commit: 68d1cecc728b6e9112e25e836348f2c03e6a1825 https://github.com/proftpd/proftpd/commit/68d1cecc728b6e9112e25e836348f2c03e6a1825 Author: tjsaunders <tjs...@bl...> Date: 2014-10-14 (Tue, 14 Oct 2014) Changed paths: M contrib/mod_tls.c Log Message: ----------- Log (via trace messages) when putting a socket into nonblocking/blocking mode results in errors. Make it clear that setting other socket options can be ignored if they fail. Commit: b0a63591289a1c4667454dd53faf18707e26c7c9 https://github.com/proftpd/proftpd/commit/b0a63591289a1c4667454dd53faf18707e26c7c9 Author: tjsaunders <tjs...@bl...> Date: 2014-10-14 (Tue, 14 Oct 2014) Changed paths: M contrib/mod_sftp/fxp.c Log Message: ----------- If there are errors setting a file handle as blocking, log them via trace logging. Commit: df36626d447e8cfb8715b37b29a04fcb568f0d46 https://github.com/proftpd/proftpd/commit/df36626d447e8cfb8715b37b29a04fcb568f0d46 Author: tjsaunders <tjs...@bl...> Date: 2014-10-14 (Tue, 14 Oct 2014) Changed paths: M modules/mod_delay.c Log Message: ----------- Check for fcntl(2) return values, and log them (via trace logging). Commit: 841f4809a047c64a5b3f85d8b1aa8d979cdac0c7 https://github.com/proftpd/proftpd/commit/841f4809a047c64a5b3f85d8b1aa8d979cdac0c7 Author: tjsaunders <tjs...@bl...> Date: 2014-10-14 (Tue, 14 Oct 2014) Changed paths: M src/expr.c Log Message: ----------- Style nit. Commit: 58ffaa49d73fd5891194866eba8200da0a043012 https://github.com/proftpd/proftpd/commit/58ffaa49d73fd5891194866eba8200da0a043012 Author: TJ Saunders <tj...@ca...> Date: 2014-10-14 (Tue, 14 Oct 2014) Changed paths: M contrib/coverity/modeling.c M contrib/mod_copy.c M contrib/mod_ldap.c M contrib/mod_radius.c M contrib/mod_sftp/agent.c M contrib/mod_sftp/display.c M contrib/mod_sftp/fxp.c M contrib/mod_sftp/kex.c M contrib/mod_sftp/keys.c M contrib/mod_sftp/misc.c M contrib/mod_sftp/packet.c M contrib/mod_sftp/rfc4716.c M contrib/mod_shaper.c M contrib/mod_snmp/mod_snmp.c M contrib/mod_sql_passwd.c M contrib/mod_tls.c M lib/pr-syslog.c M modules/mod_delay.c M modules/mod_xfer.c M src/bindings.c M src/cmd.c M src/ctrls.c M src/data.c M src/dirtree.c M src/display.c M src/expr.c M src/fsio.c M src/inet.c M src/log.c M src/netio.c M src/stash.c M src/str.c M src/timers.c M utils/ftptop.c Log Message: ----------- Merge pull request #55 from proftpd/coverity-defects Coverity defects Compare: https://github.com/proftpd/proftpd/compare/683d06991844...58ffaa49d73f |