Fix possible double close and use of unopened socket #825
Conversation
| close(sock); | ||
| error_after_close: | ||
| Py_XDECREF(py_is_up); |
There was a problem hiding this comment.
I kinda don't like having two separate goto handlers. I think close()sing the socket twice will not be a problem,
There was a problem hiding this comment.
Well, once a socket is closed - the file descriptor is available for use elsewhere. And thus a double close could end up closing that - which may cause a problem elsewhere. If you don't like multiple goto handlers, you might prefer moving the close(sock) on line 541 down to 545 before the return. That way there is a close in every path in the function - and no double close.
There was a problem hiding this comment.
I like that. Can you update the PR also including changes for the HISTORY.rst file?
|
@giampaolo Sorry for getting back to this after so long - have look at the updated diff. |
| @@ -19,6 +19,7 @@ Bug tracker at https://github.com/giampaolo/psutil/issues | |||
| - #797: [Linux] net_if_stats() may raise OSError for certain NIC cards. | |||
| - #813: Process.as_dict() should ignore extraneous attribute names which gets | |||
| attached to the Process instance. | |||
| - #825: Fix possible double close and use of unopened socket | |||
There was a problem hiding this comment.
Please specify the platform ([Linux]) and the function which was affected (the high level, end-user psutil function, not the C function)
|
Just fix this https://github.com/giampaolo/psutil/pull/825/files#r66893740 and update CREDITS file then it's good to go. |
Upon successful completion, socket() shall return a non-negative integer, the socket file descriptor. Otherwise, a value of -1 shall be returned and errno set to indicate the error.. Thus on line 540, 0 is a valid socket fd - and the check should be against -1