From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 996FEC004C9 for ; Tue, 7 May 2019 06:01:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A25D20C01 for ; Tue, 7 May 2019 06:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557208866; bh=pHpX70e2DWIaL+qUl7lj7qgJrjw/6jMx8pPh2TTmG84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ojGDajAmJ194ANODDxrrX9ZX9DwvdxPoxnUSuT7h6yCwqhJa6gOENyYc35uqjndIn adxR7I5bqw3nU8oqtKhNbc8qBUjk/JpNx+1+RETWA5okjvYSCoN3m827sN9ZGP/AzB k+Mc4k4oG/q+pW9oRb3XJ64fNv63ZdapoDCWdkQ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727749AbfEGGBA (ORCPT ); Tue, 7 May 2019 02:01:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:56182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727994AbfEGFgK (ORCPT ); Tue, 7 May 2019 01:36:10 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3252420989; Tue, 7 May 2019 05:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557207370; bh=pHpX70e2DWIaL+qUl7lj7qgJrjw/6jMx8pPh2TTmG84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kq4ZCnvZztZdRZXYTB3NHiAJwqHohm4llYfRxSdFf6WxyzkqSLe48Z7j7f2PmGT9J 0njpRUhz2lX/sLZ8fv49Zf9nL/5r3PnVNcsX0kCOqG7AGT3UjDnfoHAk0D/yZrPgQX 20JMa1G/rf4STXhR7rLm8custPw5rmDEE5mwsTPg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Fietkau , Johannes Berg , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 11/81] mac80211: fix unaligned access in mesh table hash function Date: Tue, 7 May 2019 01:34:42 -0400 Message-Id: <20190507053554.30848-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190507053554.30848-1-sashal@kernel.org> References: <20190507053554.30848-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Felix Fietkau [ Upstream commit 40586e3fc400c00c11151804dcdc93f8c831c808 ] The pointer to the last four bytes of the address is not guaranteed to be aligned, so we need to use __get_unaligned_cpu32 here Signed-off-by: Felix Fietkau Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/mesh_pathtbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index c3a7396fb955..49a90217622b 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@ -23,7 +23,7 @@ static void mesh_path_free_rcu(struct mesh_table *tbl, struct mesh_path *mpath); static u32 mesh_table_hash(const void *addr, u32 len, u32 seed) { /* Use last four bytes of hw addr as hash index */ - return jhash_1word(*(u32 *)(addr+2), seed); + return jhash_1word(__get_unaligned_cpu32((u8 *)addr + 2), seed); } static const struct rhashtable_params mesh_rht_params = { -- 2.20.1