From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E23162FA624; Tue, 17 Jun 2025 16:59:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750179569; cv=none; b=repsbJNcCKeCaNy6mEJCa7s7ZxY91o1mZL3Pa6iis39U1P2ajfAJyiFqGe5RHqP3H7jC60UTjEUlMX8hAB8V1WTe8tkbWLkFxCnDWR0xQ6WsBhq8eOwRknmA7pXgBxFNGsq+jHKPspzx4wBNCD3IlnWZWwwvwy/mo2cfNMOerdI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750179569; c=relaxed/simple; bh=IuUNewuFVdisEzGnDHFqL4p/AXlA5W2c72XyLMZA/Hc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n9AhxjOIXdgn/VWAhG2lKRV4lZYNcJB4VmZV0GOE/wh03aqwu+KiGuTLw/kkjAtJcRYq99Oo0keeknCviM1j6G9fHgsOFpWmg+oENUSNAlFgBwVWUTwMdW2zXsi06jdaVO7hxNgqFB2k3rXcUQCFJ2ZtlCW+92rBevQvIyp0MCU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GJ4mZHCb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GJ4mZHCb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50CDBC4CEE3; Tue, 17 Jun 2025 16:59:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750179568; bh=IuUNewuFVdisEzGnDHFqL4p/AXlA5W2c72XyLMZA/Hc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJ4mZHCbbCnZbldtKoavDznLV7832bIkEIgo7Xx84HMS1H8q/s9DaIdfkRjkCko4D s5y6Pi8h0mUdrdPYMNavznCcgSuJ0AEgBq1SL+kTL0bIPWiJ2jTdcOELemlK81wKzX 8bAbRptVIjDTgxZqjWsg/U3LC8A7Qr3A+ycb8NY0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot , Eric Dumazet , Kuniyuki Iwashima , Paul Moore , Jakub Kicinski Subject: [PATCH 6.15 774/780] calipso: unlock rcu before returning -EAFNOSUPPORT Date: Tue, 17 Jun 2025 17:28:02 +0200 Message-ID: <20250617152523.032125063@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152451.485330293@linuxfoundation.org> References: <20250617152451.485330293@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet commit 3cae906e1a6184cdc9e4d260e4dbdf9a118d94ad upstream. syzbot reported that a recent patch forgot to unlock rcu in the error path. Adopt the convention that netlbl_conn_setattr() is already using. Fixes: 6e9f2df1c550 ("calipso: Don't call calipso functions for AF_INET sk.") Reported-by: syzbot Signed-off-by: Eric Dumazet Cc: Kuniyuki Iwashima Acked-by: Paul Moore Link: https://patch.msgid.link/20250604133826.1667664-1-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/netlabel/netlabel_kapi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c @@ -1165,8 +1165,10 @@ int netlbl_conn_setattr(struct sock *sk, break; #if IS_ENABLED(CONFIG_IPV6) case AF_INET6: - if (sk->sk_family != AF_INET6) - return -EAFNOSUPPORT; + if (sk->sk_family != AF_INET6) { + ret_val = -EAFNOSUPPORT; + goto conn_setattr_return; + } addr6 = (struct sockaddr_in6 *)addr; entry = netlbl_domhsh_getentry_af6(secattr->domain,