Skip to content

af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag

Aaron Conole netdev 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest2 patches 1 replyIn review
  2. v32 patches 2 repliesSuperseded
  3. v21 patch 4 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v11 patch2 repliesSuperseded

Changes in v4 from the cover letter

- Eliminated an XXX comment
- Changed from goto unlock to explicit unix_state_unlock() and break

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2af_unix: Convert the unix_sk macro to an inline function for type safetyinclude/net/af_unix.h+5 -10 replies
2/2af_unix: return data from multiple SKBs on recv() with MSG_PEEK flagnet/unix/af_unix.c+14 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH v4 0/2] [net] af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag

This patch set implements a bugfix for kernel.org bugzilla #12323, allowing MSG_PEEK to return all queued data on the unix domain socket, not just the data contained in a single SKB.

This is the v3 version of this patch, which includes a suggested modification by Eric Dumazet to convert the unix_sk() conversion macro to a static inline function. These patches are independent and can be applied separately.

This set was tested over a 24-hour period, utilizing a loop continually executing the bugzilla issue attached python code. It was instrumented with
a pr_err_once() ([ 13.798683] unix: went there at least one time).

v2->v3:
- Added Eric Dumazet's suggestion for #define to static inline
- Fixed an issue calling unix_state_lock() with an invalid argument

v3->v4:
- Eliminated an XXX comment
- Changed from goto unlock to explicit unix_state_unlock() and break

Aaron Conole (2):
[net] af_unix: Convert the unix_sk macro to an inline function for
type safety
[net] af_unix: return data from multiple SKBs on recv() with MSG_PEEK
flag

 include/net/af_unix.h |  6 +++++-
 net/unix/af_unix.c    | 19 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)
Signature · 1 line
1.9.1