diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 09:59:32 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-04 09:59:32 -0400 |
| commit | 6ab8f277d043a015718ca6b454192a11d3e86e71 (patch) | |
| tree | 60f281a2eabf32843b9c8fa86eb3f4fb81282f2b | |
| parent | c4639869c55ddd09dc5bdd17dde5e0065acd3a78 (diff) | |
| download | longterm-queue-4.12-6ab8f277d043a015718ca6b454192a11d3e86e71.tar.gz | |
net: refresh kcm patch for extra "unlikely"
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/fix-kcm_clone.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/fix-kcm_clone.patch b/queue/fix-kcm_clone.patch index 5c486cc..7b9753d 100644 --- a/queue/fix-kcm_clone.patch +++ b/queue/fix-kcm_clone.patch @@ -1,4 +1,4 @@ -From a5739435b5a3b8c449f8844ecd71a3b1e89f0a33 Mon Sep 17 00:00:00 2001 +From 87ea43410088445a09c54cedb05231b29b1ee208 Mon Sep 17 00:00:00 2001 From: Al Viro <viro@ZenIV.linux.org.uk> Date: Tue, 5 Dec 2017 23:27:57 +0000 Subject: [PATCH] fix kcm_clone() @@ -17,12 +17,13 @@ Cc: stable@vger.kernel.org # v4.6+ Acked-by: Tom Herbert <tom@herbertland.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c -index 0b750a22c4b9..c5fa634e63ca 100644 +index 0ddcb209bea6..789e88538b0d 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c -@@ -1625,60 +1625,35 @@ static struct proto kcm_proto = { +@@ -1626,60 +1626,35 @@ static struct proto kcm_proto = { }; /* Clone a kcm socket. */ @@ -54,7 +55,7 @@ index 0b750a22c4b9..c5fa634e63ca 100644 - } - - newfile = sock_alloc_file(newsock, 0, osock->sk->sk_prot_creator->name); -- if (IS_ERR(newfile)) { +- if (unlikely(IS_ERR(newfile))) { - err = PTR_ERR(newfile); - goto out_sock_alloc_fail; - } @@ -92,7 +93,7 @@ index 0b750a22c4b9..c5fa634e63ca 100644 } static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) -@@ -1708,17 +1683,25 @@ static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) +@@ -1709,17 +1684,25 @@ static int kcm_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) } case SIOCKCMCLONE: { struct kcm_clone info; |