From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C5AD4F55A5; Wed, 9 Sep 2026 13:56:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788962191; cv=none; b=raC2XErZR5E+Hpq5kHwdYTmFSAKOKxnPB8MlNFWZwP2K89uWFOab3KPxY/MmH5YZrWEEJnu6zx49NqHyroEV1GcDsKJPV8o44idUWYVj/yRNKmdyHXHfKvkFPxdz8WPV5f8ErlFOBfqaC9d1LRHnpy3UWXFxFQ3LRSbzXV8VPfU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788962191; c=relaxed/simple; bh=r7Zw8pinyYWfojEWaxz/MvFJ9jEeEgj5/CRyOP1RTbs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sToVjDo4N1Zifjarwi4k0tatB5/MirXwfWz/VlncDkl/QO//polPlfJz9TLI5bFKeOzx+mfo5nc59MssedSErccWZbIEMeE69RTsz28dcO2SxF5Av+uXVBJ17Z7+6dNSmu4hlkrGkJZHpNlMAcgUROy4kXZnDReQ7Gi5Fd4q5tY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XTXwtq6Z; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XTXwtq6Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 737381F00A3A; Wed, 9 Sep 2026 13:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788962190; bh=hEJKcf7TwMjBNOp/RseOtLUs0E9pLAZ7PnnJ3vYkB38=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XTXwtq6ZBt/Mq4bEL9qvOn86Il2odQcyYDt0j01LVHzidSCx+rXMlx5KalfsA4Y7G E45+TTvNF68S5kMJqpUWBZklw0od+k70gPZnhiqrrpyhwZPU3pZKTkApsS/a2HUpBC vFSogrYFwNLSlak3HZ6zH3r76zpIJIyU7qp24xpU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Sven Eckelmann Subject: [PATCH 7.2 204/556] batman-adv: dat: avoid unaligned fault in IP extraction Date: Wed, 9 Sep 2026 15:38:04 +0200 Message-ID: <20260909134237.566976934@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909134230.441546314@linuxfoundation.org> References: <20260909134230.441546314@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sven Eckelmann commit 0121afa52cdb88cfb4d5d7bd126a23a9100121d8 upstream. Independent of the alignment of the ARP packet in the SKB, either the batadv_arp_ip_src or the batadv_arp_ip_dst will have an unaligned access (on HW without native unaligned read support). Use get_unaligned() to handle this properly on all architectures. Cc: stable@vger.kernel.org Reported-by: Sashiko Fixes: 5c3a0e553593 ("batman-adv: Distributed ARP Table - add ARP parsing functions") Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/distributed-arp-table.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -250,7 +250,10 @@ static u8 *batadv_arp_hw_src(struct sk_b */ static __be32 batadv_arp_ip_src(struct sk_buff *skb, int hdr_size) { - return *(__force __be32 *)(batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN); + u8 *src = batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN; + __be32 *ip = (__force __be32 *)src; + + return get_unaligned(ip); } /** @@ -275,8 +278,9 @@ static u8 *batadv_arp_hw_dst(struct sk_b static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size) { u8 *dst = batadv_arp_hw_src(skb, hdr_size) + ETH_ALEN * 2 + 4; + __be32 *ip = (__force __be32 *)dst; - return *(__force __be32 *)dst; + return get_unaligned(ip); } /**