Skip to content

[PW_SID:1078270] uaccess/sockptr: copy_struct_ fixes and more helpers#3459

Open
BluezTestBot wants to merge 7 commits intoworkflowfrom
1078270
Open

[PW_SID:1078270] uaccess/sockptr: copy_struct_ fixes and more helpers#3459
BluezTestBot wants to merge 7 commits intoworkflowfrom
1078270

Conversation

@BluezTestBot
Copy link
Copy Markdown
Owner

@BluezTestBot BluezTestBot commented Apr 7, 2026

Currently all callers pass ignored_trailing=NULL, but I have
code that will make use of.

Now it actually behaves like documented:

  • If @usize < @Ksize, then the kernel is trying to pass userspace a newer
    struct than it supports. Thus we only copy the interoperable portions
    (@usize) and ignore the rest (but @ignored_trailing is set to %true if
    any of the trailing (@Ksize - @usize) bytes are non-zero).

Fixes: 424a55a ("uaccess: add copy_struct_to_user helper")
Cc: Dmitry Safonov 0x7f454c46@gmail.com
Cc: Dmitry Safonov dima@arista.com
Cc: Francesco Ruggeri fruggeri@arista.com
Cc: Salam Noureddine noureddine@arista.com
Cc: David Ahern dsahern@kernel.org
Cc: David S. Miller davem@davemloft.net
Cc: Michal Luczaj mhal@rbox.co
Cc: David Wei dw@davidwei.uk
Cc: Luiz Augusto von Dentz luiz.von.dentz@intel.com
Cc: Luiz Augusto von Dentz luiz.dentz@gmail.com
Cc: Marcel Holtmann marcel@holtmann.org
Cc: Xin Long lucien.xin@gmail.com
Cc: Eric Dumazet edumazet@google.com
Cc: Kuniyuki Iwashima kuniyu@google.com
Cc: Paolo Abeni pabeni@redhat.com
Cc: Willem de Bruijn willemb@google.com
Cc: Neal Cardwell ncardwell@google.com
Cc: Jakub Kicinski kuba@kernel.org
Cc: Simon Horman horms@kernel.org
Cc: Aleksa Sarai cyphar@cyphar.com
Cc: Christian Brauner brauner@kernel.org
CC: Kees Cook keescook@chromium.org
Cc: netdev@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Metzmacher metze@samba.org

include/linux/uaccess.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

phx0fer and others added 7 commits April 6, 2026 16:30
@phx0fer @Vudentz
Bluetooth: l2cap: Add missing chan lock in l2cap_ecred_reconf_rsp
ff4aaa2 
l2cap_ecred_reconf_rsp() calls l2cap_chan_del() without holding
l2cap_chan_lock(). Every other l2cap_chan_del() caller in the file
acquires the lock first. A remote BLE device can send a crafted
L2CAP ECRED reconfiguration response to corrupt the channel list
while another thread is iterating it.

Add l2cap_chan_hold() and l2cap_chan_lock() before l2cap_chan_del(),
and l2cap_chan_unlock() and l2cap_chan_put() after, matching the
pattern used in l2cap_ecred_conn_rsp() and l2cap_conn_del().

Fixes: 15f02b9 ("Bluetooth: L2CAP: Add L2CAP_ECRED_RECONF support")
Signed-off-by: Dudu Lu <phx0fer@gmail.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
@tedd-an
workflow: Add workflow files for ci
66f6fb9 
This patch adds workflow files for ci:

[sync.yml]
 - The workflow file for scheduled work
 - Sync the repo with upstream repo and rebase the workflow branch
 - Review the patches in the patchwork and creates the PR if needed

[ci.yml]
 - The workflow file for CI tasks
 - Run CI tests when PR is created

Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com>
@metze-samba @tedd-an
uaccess: fix ignored_trailing logic in copy_struct_to_user()
44792f5 
Currently all callers pass ignored_trailing=NULL, but I have
code that will make use of.

Now it actually behaves like documented:

* If @usize < @Ksize, then the kernel is trying to pass userspace a newer
  struct than it supports. Thus we only copy the interoperable portions
  (@usize) and ignore the rest (but @ignored_trailing is set to %true if
  any of the trailing (@Ksize - @usize) bytes are non-zero).

Fixes: 424a55a ("uaccess: add copy_struct_to_user helper")
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Dmitry Safonov <dima@arista.com>
Cc: Francesco Ruggeri <fruggeri@arista.com>
Cc: Salam Noureddine <noureddine@arista.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Michal Luczaj <mhal@rbox.co>
Cc: David Wei <dw@davidwei.uk>
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Xin Long <lucien.xin@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Simon Horman <horms@kernel.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Christian Brauner <brauner@kernel.org>
CC: Kees Cook <keescook@chromium.org>
Cc: netdev@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@metze-samba @tedd-an
sockptr: fix usize check in copy_struct_from_sockptr() for user pointers
17dc340 
copy_struct_from_user will never hit the check_zeroed_user() call
and will never return -E2BIG if new userspace passed new bits in a
larger structure than the current kernel structure.

As far as I can there are no critical/related uapi changes in

- include/net/bluetooth/bluetooth.h and net/bluetooth/sco.c
  after the use of copy_struct_from_sockptr in v6.13-rc3
- include/uapi/linux/tcp.h and net/ipv4/tcp_ao.c
  after the use of copy_struct_from_sockptr in v6.6-rc1

So that new callers will get the correct behavior from the start.

Fixes: 4954f17 ("net/tcp: Introduce TCP_AO setsockopt()s")
Fixes: ef84703 ("net/tcp: Add TCP-AO getsockopt()s")
Fixes: faadfab ("net/tcp: Add TCP_AO_REPAIR")
Fixes: 3e643e4 ("Bluetooth: Improve setsockopt() handling of malformed user input")
Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Dmitry Safonov <dima@arista.com>
Cc: Francesco Ruggeri <fruggeri@arista.com>
Cc: Salam Noureddine <noureddine@arista.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Michal Luczaj <mhal@rbox.co>
Cc: David Wei <dw@davidwei.uk>
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Xin Long <lucien.xin@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Simon Horman <horms@kernel.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Christian Brauner <brauner@kernel.org>
CC: Kees Cook <keescook@chromium.org>
Cc: netdev@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@metze-samba @tedd-an
uaccess: add copy_struct_{from,to}_bounce_buffer() helpers
b56ff8c 
These are similar to copy_struct_{from,to}_user() but operate
on kernel buffers instead of user buffers.

They can be used when there is a temporary bounce buffer used,
e.g. in msg_control or similar places.

It allows us to have the same logic to handle old vs. current
and current vs. new structures in the same compatible way.

copy_struct_from_sockptr() will also be able to
use copy_struct_from_bounce_buffer() for the kernel
case as follow us patch.

I'll use this in my IPPROTO_SMBDIRECT work,
but maybe it will also be useful for others...
IPPROTO_QUIC will likely also use it.

Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Dmitry Safonov <dima@arista.com>
Cc: Francesco Ruggeri <fruggeri@arista.com>
Cc: Salam Noureddine <noureddine@arista.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Michal Luczaj <mhal@rbox.co>
Cc: David Wei <dw@davidwei.uk>
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Xin Long <lucien.xin@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Simon Horman <horms@kernel.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Christian Brauner <brauner@kernel.org>
CC: Kees Cook <keescook@chromium.org>
Cc: netdev@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@metze-samba @tedd-an
sockptr: let copy_struct_from_sockptr() use copy_struct_from_bounce_b…
d887da3 
…uffer()

The world would be better without sockptr_t, but this at least
simplifies copy_struct_from_sockptr() to be just a dispatcher for
copy_struct_from_user() or copy_struct_from_bounce_buffer() without any
special logic on its own.

Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Dmitry Safonov <dima@arista.com>
Cc: Francesco Ruggeri <fruggeri@arista.com>
Cc: Salam Noureddine <noureddine@arista.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Michal Luczaj <mhal@rbox.co>
Cc: David Wei <dw@davidwei.uk>
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Xin Long <lucien.xin@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Simon Horman <horms@kernel.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Christian Brauner <brauner@kernel.org>
CC: Kees Cook <keescook@chromium.org>
Cc: netdev@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@metze-samba @tedd-an
sockptr: introduce copy_struct_to_sockptr()
bdfa493 
We already have copy_struct_from_sockptr() as wrapper to
copy_struct_from_user() or copy_struct_from_bounce_buffer(),
so it's good to have copy_struct_to_sockptr()
as well matching the behavior of copy_struct_to_user()
or copy_struct_to_bounce_buffer().

The world would be better without sockptr_t, but having
copy_struct_to_sockptr() is better than open code it
in various places.

I'll use this in my IPPROTO_SMBDIRECT work,
but maybe it will also be useful for others...
IPPROTO_QUIC will likely also use it.

Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Dmitry Safonov <dima@arista.com>
Cc: Francesco Ruggeri <fruggeri@arista.com>
Cc: Salam Noureddine <noureddine@arista.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Michal Luczaj <mhal@rbox.co>
Cc: David Wei <dw@davidwei.uk>
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Xin Long <lucien.xin@gmail.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Simon Horman <horms@kernel.org>
Cc: Aleksa Sarai <cyphar@cyphar.com>
Cc: Christian Brauner <brauner@kernel.org>
CC: Kees Cook <keescook@chromium.org>
Cc: netdev@vger.kernel.org
Cc: linux-bluetooth@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

CheckPatch
Desc: Run checkpatch.pl script
Duration: 0.53 seconds
Result: PENDING

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

GitLint
Desc: Run gitlint
Duration: 0.35 seconds
Result: PENDING

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

SubjectPrefix
Desc: Check subject contains "Bluetooth" prefix
Duration: 0.68 seconds
Result: FAIL
Output:

"Bluetooth: " prefix is not specified in the subject
"Bluetooth: " prefix is not specified in the subject
"Bluetooth: " prefix is not specified in the subject
"Bluetooth: " prefix is not specified in the subject
"Bluetooth: " prefix is not specified in the subject

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

BuildKernel
Desc: Build Kernel for Bluetooth
Duration: 26.30 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

CheckAllWarning
Desc: Run linux kernel with all warning enabled
Duration: 28.58 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

CheckSparse
Desc: Run sparse tool with linux kernel
Duration: 27.59 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

BuildKernel32
Desc: Build 32bit Kernel for Bluetooth
Duration: 25.24 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunnerSetup
Desc: Setup kernel and bluez for test-runner
Duration: 563.43 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_l2cap-tester
Desc: Run l2cap-tester with test-runner
Duration: 27.70 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_iso-tester
Desc: Run iso-tester with test-runner
Duration: 41.94 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_bnep-tester
Desc: Run bnep-tester with test-runner
Duration: 6.27 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_mgmt-tester
Desc: Run mgmt-tester with test-runner
Duration: 114.63 seconds
Result: FAIL
Output:

Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4

Failed Test Cases
Read Exp Feature - Success                           Failed       0.105 seconds

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_rfcomm-tester
Desc: Run rfcomm-tester with test-runner
Duration: 9.39 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_sco-tester
Desc: Run sco-tester with test-runner
Duration: 14.42 seconds
Result: FAIL
Output:

WARNING: possible circular locking dependency detected
BUG: sleeping function called from invalid context at net/core/sock.c:3782
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_ioctl-tester
Desc: Run ioctl-tester with test-runner
Duration: 10.14 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_mesh-tester
Desc: Run mesh-tester with test-runner
Duration: 11.56 seconds
Result: FAIL
Output:

Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0

Failed Test Cases
Mesh - Send cancel - 1                               Timed out    1.832 seconds
Mesh - Send cancel - 2                               Timed out    2.000 seconds

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_smp-tester
Desc: Run smp-tester with test-runner
Duration: 8.64 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

TestRunner_userchan-tester
Desc: Run userchan-tester with test-runner
Duration: 6.61 seconds
Result: PASS

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 7, 2026

IncrementalBuild
Desc: Incremental build with the patches in the series
Duration: 0.77 seconds
Result: PENDING

@github-actions github-actions bot force-pushed the workflow branch 3 times, most recently from f07ea67 to 9a108c6 Compare April 8, 2026 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@BluezTestBot @phx0fer @tedd-an @metze-samba