From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225X9gZ8AlL3/1jvWI+65isdJQ5AanuAZV57muKt5Jjq0SLPiE4MrFM5JHIMnxtiPJDdJlv3 ARC-Seal: i=1; a=rsa-sha256; t=1517256407; cv=none; d=google.com; s=arc-20160816; b=rpVft9nSp/ZrHRl7GYMbz7Ly0bZWgbo1ROsVk7q6Pqb8/FtJswkODUaGpYxtfPf9Hm urHKl2xoLTzZEG6xWBrZ7HJ3bj+wNSyHkM7OuF2UgyMdluIV0AUlWL+PQkEaLGNmYUqO gsR9t2xr0aRmPPErsBoj1EDNIsdYddo3nWPS1VF/owED7WlDg2T2C2sUtjr8w1sW53sd zmGf8LOGlOO9RXCwPP4P6TqjaWlFr5IqHzBlheqgDyGm3vPSqmTDig7wSdIrBGGR2H5b 7DMYT2NuRunxDA+0GosGKl2JMLnE9BlpUNYTypZMKVrtbsAfXkdUpAs1epswVNu2DGKj uNfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=aRp13/pO8RXuGPwLxRQB6FYvIAYgj57zIYkAzgrS+zA=; b=vju9TKI1qitaZHXEsMAbzYNNTFlMrIOqgR7yFuQ3nBoAT8s31S24f+pD2HK8XOyrCm TJLIopZVpa5QGr98NnUZv3K1nkPL2rSxyJADCx1RR7A/9kqeJdG/JyZftw0l+sDNGSSG 8DL7+28zenj4bxHHYztttDsc081EJtTJd02HeYrrTxriGBSJpPuk9qLyAlnx1747EIBQ 3T7pEXpdOLiq+LuAkpJfhNSVke22gcnrj5ZbBB5X+GdmX7dt+pQVugLszvsD800CoFra iyegFHI4/nqe/qQo0cN7cr2IsXH5Iq2Gt/sVxOeXZt4Fj15dlQccbWm3GFoUb+PCliPl ZUmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jim Westfall , "David S. Miller" Subject: [PATCH 3.18 50/52] net: Allow neigh contructor functions ability to modify the primary_key Date: Mon, 29 Jan 2018 13:57:08 +0100 Message-Id: <20180129123630.359984607@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958529601343755?= X-GMAIL-MSGID: =?utf-8?q?1590958655302095967?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jim Westfall [ Upstream commit 096b9854c04df86f03b38a97d40b6506e5730919 ] Use n->primary_key instead of pkey to account for the possibility that a neigh constructor function may have modified the primary_key value. Signed-off-by: Jim Westfall Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -508,7 +508,7 @@ struct neighbour *__neigh_create(struct if (atomic_read(&tbl->entries) > (1 << nht->hash_shift)) nht = neigh_hash_grow(tbl, nht->hash_shift + 1); - hash_val = tbl->hash(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift); + hash_val = tbl->hash(n->primary_key, dev, nht->hash_rnd) >> (32 - nht->hash_shift); if (n->parms->dead) { rc = ERR_PTR(-EINVAL); @@ -520,7 +520,7 @@ struct neighbour *__neigh_create(struct n1 != NULL; n1 = rcu_dereference_protected(n1->next, lockdep_is_held(&tbl->lock))) { - if (dev == n1->dev && !memcmp(n1->primary_key, pkey, key_len)) { + if (dev == n1->dev && !memcmp(n1->primary_key, n->primary_key, key_len)) { if (want_ref) neigh_hold(n1); rc = n1;