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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1839C7EE32 for ; Sun, 26 Feb 2023 14:50:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230164AbjBZOuY (ORCPT ); Sun, 26 Feb 2023 09:50:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229919AbjBZOtU (ORCPT ); Sun, 26 Feb 2023 09:49:20 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B75612BC1; Sun, 26 Feb 2023 06:48:07 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 27E2EB80BA7; Sun, 26 Feb 2023 14:47:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 56DBDC4339E; Sun, 26 Feb 2023 14:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677422877; bh=SsLC3DuoRr7IIjgp4V6ByD7OU4nl/phwXVPN1WE/Y/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vCgClJJQdELzNqJDQ9RShub5gwdJXUvsvfCUXIvUV7/SNzVhev3C//PBs3+Tgcofh 0ZJTHLLvimVl/ozge9Skg4k+Lg71oY74E2tf4WWqn2rfqz/Qy+AhVsblYMiCwo/f/r z2XOlFbW5yjA5YoxwofrZ2/drHhi0/qLN6eBU4dAfSUB7L7dNoCMfh9AHSDjXDfctI e6FVsFoLqMDQPZpkXSBlQ3rvmFsCG8pTHdgyht3N7Jr01YLQqXJPTyXuMmCMMEyxTW U/uNGdr0X/uMpadYWlPoANtLZUpBgQnjlp8rHuKGvZG4+QStjr/OwK1SNJKiPgAPdL GvuSwB5sXXRpg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oliver Hartkopp , syzbot+5aed6c3aaba661f5b917@syzkaller.appspotmail.com, Marc Kleine-Budde , Sasha Levin , davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, linux-can@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 29/49] can: isotp: check CAN address family in isotp_bind() Date: Sun, 26 Feb 2023 09:46:29 -0500 Message-Id: <20230226144650.826470-29-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144650.826470-1-sashal@kernel.org> References: <20230226144650.826470-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Oliver Hartkopp [ Upstream commit c6adf659a8ba85913e16a571d5a9bcd17d3d1234 ] Add missing check to block non-AF_CAN binds. Syzbot created some code which matched the right sockaddr struct size but used AF_XDP (0x2C) instead of AF_CAN (0x1D) in the address family field: bind$xdp(r2, &(0x7f0000000540)={0x2c, 0x0, r4, 0x0, r2}, 0x10) ^^^^ This has no funtional impact but the userspace should be notified about the wrong address family field content. Link: https://syzkaller.appspot.com/text?tag=CrashLog&x=11ff9d8c480000 Reported-by: syzbot+5aed6c3aaba661f5b917@syzkaller.appspotmail.com Signed-off-by: Oliver Hartkopp Link: https://lore.kernel.org/all/20230104201844.13168-1-socketcan@hartkopp.net Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- net/can/isotp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/can/isotp.c b/net/can/isotp.c index fc81d77724a13..9bc344851704e 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1220,6 +1220,9 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len) if (len < ISOTP_MIN_NAMELEN) return -EINVAL; + if (addr->can_family != AF_CAN) + return -EINVAL; + /* sanitize tx CAN identifier */ if (tx_id & CAN_EFF_FLAG) tx_id &= (CAN_EFF_FLAG | CAN_EFF_MASK); -- 2.39.0