gh-111178: Fix getsockaddrarg() undefined behavior #131668
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Don't pass direct references to sockaddr members since their type may not match PyArg_ParseTuple() types. Instead, use temporary 'int' and 'unsigned char' variables, and update sockaddr members afterwards.
|
Fix the following error: |
|
@picnixz: This change looks like a bugfix, do you think that it should be backported to 3.12 and 3.13 branches? |
picnixz
reviewed
Mar 24, 2025
I didn't get UBsan warning/error on this code, so I prefer to leave it unchanged.
This function is called by sock.bind(), sock.connect() and sock.sendto() for example. |
At compile time I don't think there will be but at runtime it might be because the tests are not covering the calls
By internal I meant it's not documented (but yes it's called by many other functions) |
vstinner
added
needs backport to 3.12
I added abort() in BTPROTO_RFCOMM and BTPROTO_HCI code paths and ran test_socket. Sadly, test_socket pass with my change, which means that these two code paths are not tested by test_socket. If it's not tested, I don't feel comfortable to modify these code paths. |
|
On Linux, the struct sockaddr_l2 {
sa_family_t l2_family;
unsigned short l2_psm;
bdaddr_t l2_bdaddr;
unsigned short l2_cid;
uint8_t l2_bdaddr_type;
};l2_psm and l2_cid members are unsigned. So I'm not sure if my change is correct. |
|
On common platforms I afraid that there is a similar error for BTPROTO_RFCOMM: on Linux, FreeBSD and NetBSD the https://man.archlinux.org/man/l2cap.7.en |
Fix also BTPROTO_RFCOMM and BTPROTO_HCI code path.
|
I updated my PR to use @serhiy-storchaka @picnixz: Please review the updated PR. |
| @@ -2094,11 +2109,13 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, | |||
| return 0; | |||
| #else /* __NetBSD__ || __DragonFly__ */ | |||
| _BT_HCI_MEMB(addr, family) = AF_BLUETOOTH; | |||
| if (!PyArg_ParseTuple(args, "i", &_BT_HCI_MEMB(addr, dev))) { | |||
| unsigned short dev = _BT_HCI_MEMB(addr, dev); | |||
There was a problem hiding this comment.
There's a bunch of define at the top of the file:
#if (defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)) \
&& !defined(__NetBSD__) && !defined(__DragonFly__)
#define USE_BLUETOOTH 1
#if defined(__FreeBSD__)
...
#define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
...
#elif defined(__NetBSD__) || defined(__DragonFly__) // <- unreachable
...
#define _BT_HCI_MEMB(sa, memb) ((sa)->bt_##memb)
#else
...
#define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
...
#endif
#endifBut AFAICT, the elif defined(__NetBSD__) || defined(__DragonFly__) is not possible at all since we're still in the big #if where we want !defined(__NetBSD__) && !defined(__DragonFly__). So indeed, it looks like the macro wouldn't be defined here.
I think we should remove !defined(__NetBSD__) && !defined(__DragonFly__)
There was a problem hiding this comment.
I know about _BT_HCI_MEMB. I asked on what platform the *_dev member is defined, what its name and the structure name. Its turned out that it is hci_node on FreeBSD and NetBSD. hci_dev should exist on Linux.
serhiy-storchaka
added
the
🔨 test-with-buildbots
|
🤖 New build scheduled with the buildbot fleet by @serhiy-storchaka for commit 18ed09e 🤖 Results will be shown at: https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F131668%2Fmerge If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again. |
bedevere-bot
removed
the
🔨 test-with-buildbots
|
Oh no, build fails on FreeBSD: Unrelated failures. ARM64 Windows PR and ARM64 Windows Non-Debug PR: pythoninfo steps crash with exit code s390x Fedora Stable Clang PR, s390x RHEL8 PR, s390x RHEL9 PR: test_binary_header() of test_tools.test_msgfmt.CompilationTest failed. I don't know why, but it's unrelated to this change. |
|
(There's an open PR fixing |
|
This is weird, because on FreeBSD the It is not an integer, it is a null-terminated string (size == 32 == NG_NODESIZ == HCI_DEVNAME_SIZE). |
Alright, done. |
The socket address channel is not initialized before calling PyArg_ParseTuple().
|
Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13. |
|
Sorry, @vstinner, I could not cleanly backport this to |
|
Sorry, @vstinner, I could not cleanly backport this to |
vstinner
added a commit
to vstinner/cpython
that referenced
this pull request
Apr 1, 2025
Don't pass direct references to sockaddr members since their type may not match PyArg_ParseTuple() types. Instead, use temporary 'int' and 'unsigned char' variables, and update sockaddr members afterwards. On FreeBSD, treat BTPROTO_HCI node name as a bytes string, not as an integer. (cherry picked from commit 8cd29c2)
|
GH-131977 is a backport of this pull request to the 3.13 branch. |
|
Merged, thanks for reviews. |
vstinner
added a commit
that referenced
this pull request
Apr 1, 2025
…131977) gh-111178: Fix getsockaddrarg() undefined behavior (#131668) Don't pass direct references to sockaddr members since their type may not match PyArg_ParseTuple() types. Instead, use temporary 'int' and 'unsigned char' variables, and update sockaddr members afterwards. On FreeBSD, treat BTPROTO_HCI node name as a bytes string, not as an integer. (cherry picked from commit 8cd29c2)
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Apr 1, 2025
…onGH-131668) (pythonGH-131977) pythongh-111178: Fix getsockaddrarg() undefined behavior (pythonGH-131668) Don't pass direct references to sockaddr members since their type may not match PyArg_ParseTuple() types. Instead, use temporary 'int' and 'unsigned char' variables, and update sockaddr members afterwards. On FreeBSD, treat BTPROTO_HCI node name as a bytes string, not as an integer. (cherry picked from commit c318a03) Co-authored-by: Victor Stinner <[email protected]> (cherry picked from commit 8cd29c2)
vstinner
added a commit
that referenced
this pull request
Apr 1, 2025
…GH-131977) (#131979) [3.13] gh-111178: Fix getsockaddrarg() undefined behavior (GH-131668) (GH-131977) gh-111178: Fix getsockaddrarg() undefined behavior (GH-131668) Don't pass direct references to sockaddr members since their type may not match PyArg_ParseTuple() types. Instead, use temporary 'int' and 'unsigned char' variables, and update sockaddr members afterwards. On FreeBSD, treat BTPROTO_HCI node name as a bytes string, not as an integer. (cherry picked from commit c318a03) Co-authored-by: Victor Stinner <[email protected]> (cherry picked from commit 8cd29c2) Co-authored-by: Victor Stinner <[email protected]>
|
|
This was referenced Apr 4, 2025
seehwan
pushed a commit
to seehwan/cpython
that referenced
this pull request
Apr 16, 2025
Don't pass direct references to sockaddr members since their type may not match PyArg_ParseTuple() types. Instead, use temporary 'int' and 'unsigned char' variables, and update sockaddr members afterwards. On FreeBSD, treat BTPROTO_HCI node name as a bytes string, not as an integer.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Don't pass direct references to sockaddr members since their type may not match PyArg_ParseTuple() types. Instead, use temporary 'int' and 'unsigned char' variables, and update sockaddr members afterwards.