Patch "af_unix: Convert the unix_sk macro to an inline function for type safety" has been added to the 4.1-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
af_unix: Convert the unix_sk macro to an inline function for type safety
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
af_unix-convert-the-unix_sk-macro-to-an-inline-function-for-type-safety.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Oct 22 17:25:37 PDT 2015
From: Aaron Conole <[email protected]>
Date: Sat, 26 Sep 2015 18:50:42 -0400
Subject: af_unix: Convert the unix_sk macro to an inline function for type safety
From: Aaron Conole <[email protected]>
[ Upstream commit 4613012db1d911f80897f9446a49de817b2c4c47 ]
As suggested by Eric Dumazet this change replaces the #define with a static inline function to enjoy complaints by the compiler when misusing the API.
--- include/net/af_unix.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
include/net/af_unix.h +5 -1
@@ -64,7 +64,11 @@ struct unix_sock {#define UNIX_GC_MAYBE_CYCLE 1struct socket_wq peer_wq; }; -#define unix_sk (__sk) ((struct unix_sock *)__sk) + +static inline struct unix_sock *unix_sk (struct sock *sk) +{ +return (struct unix_sock *)sk; +}#define peer_wait peer_wq.wait
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/af_unix-convert-the-unix_sk-macro-to-an-inline-function-for-type-safety.patch queue-4.1/af_unix-return-data-from-multiple-skbs-on-recv-with-msg_peek-flag.patch queue-4.1/net-unix-fix-logic-about-sk_peek_offset.patch