]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
refresh queue-4.14/selinux-properly-handle-multiple-messages-in-selinux_netlink_send...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 May 2020 16:04:14 +0000 (18:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 4 May 2020 16:04:14 +0000 (18:04 +0200)
queue-4.14/selinux-properly-handle-multiple-messages-in-selinux_netlink_send.patch

index efc2ceaec222c75ea9366abe6303063bad26c2e4..cf865504196bb7c504e77c5f01975a8dbb912834 100644 (file)
@@ -19,12 +19,12 @@ Signed-off-by: Paul Moore <paul@paul-moore.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- security/selinux/hooks.c |   69 ++++++++++++++++++++++++++++++-----------------
- 1 file changed, 45 insertions(+), 24 deletions(-)
+ security/selinux/hooks.c |   68 ++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 44 insertions(+), 24 deletions(-)
 
 --- a/security/selinux/hooks.c
 +++ b/security/selinux/hooks.c
-@@ -5121,41 +5121,62 @@ static int selinux_tun_dev_open(void *se
+@@ -5121,39 +5121,59 @@ static int selinux_tun_dev_open(void *se
  
  static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb)
  {
@@ -107,7 +107,4 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +      return rc;
  }
  
-+
  #ifdef CONFIG_NETFILTER
- static unsigned int selinux_ip_forward(struct sk_buff *skb,