From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47404 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966025AbbJWAry (ORCPT ); Thu, 22 Oct 2015 20:47:54 -0400 Subject: Patch "af_unix: Convert the unix_sk macro to an inline function for type safety" has been added to the 4.2-stable tree To: aconole@bytheb.org, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 22 Oct 2015 17:47:53 -0700 Message-ID: <144556127367238@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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.2-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.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Oct 22 17:25:24 PDT 2015 From: Aaron Conole 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 [ 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. Signed-off-by: Aaron Conole Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- include/net/af_unix.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -63,7 +63,11 @@ struct unix_sock { #define UNIX_GC_MAYBE_CYCLE 1 struct 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 aconole@bytheb.org are queue-4.2/af_unix-convert-the-unix_sk-macro-to-an-inline-function-for-type-safety.patch queue-4.2/af_unix-return-data-from-multiple-skbs-on-recv-with-msg_peek-flag.patch queue-4.2/net-unix-fix-logic-about-sk_peek_offset.patch