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 8C6531E008B; Wed, 6 Nov 2024 12:49:18 +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=1730897358; cv=none; b=PKAwK7XFGIkXDFPv4xvgihheCo8CWlCMqJPSPxF7sRLxUzrkj32lcO/s9L2dDJmqXPNF67i/4nvCGp+N8MF3Uu40vM+PhlJ+2R9IDPxOn6lqKWTnkWGcKghiQVVGybIkEWtD52LNemwCoXlpH5Qa5h+rhERwb0+zHUINhxiGt/Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897358; c=relaxed/simple; bh=E/rYu0LXr12/KGf2IxJ2DXGsrWr5/WbqOBoZOcTynV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HEbBUe6j1uWeGdYnxJx+CUJbERvxpZZ/ZtTOJ3WHD8s85aSV3i1wja9k3M/V3xlWSk3Wul3JyKzShv8pJEa/Hva3ScPCElA819qaORYPlbTwtVHrD2rBYYEbpmkX5qUOhuqqIh5iSher5ShosvPhx71yC7GZsas0Z9l4mfYJcOQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ApGH1gXP; 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="ApGH1gXP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10E89C4CECD; Wed, 6 Nov 2024 12:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730897358; bh=E/rYu0LXr12/KGf2IxJ2DXGsrWr5/WbqOBoZOcTynV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ApGH1gXPuk6QOoRabptvyyJNZWQvKnMBm7XlZAsmhI+xjRwgD3AKVeCJGnIrQkWXP 8On9vrMHNTglP4VHOJr+/EDmVHunUBMTAJMs/B4QXAQTQZZNQloQPMHdyVpLi+R8Ky d8lDtVqcpsblwNLImNWFeG6Wur8T90OIo/X5evM4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pau Espin Pedrol , Pablo Neira Ayuso , Oliver Smith , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 026/151] gtp: allow -1 to be specified as file description from userspace Date: Wed, 6 Nov 2024 13:03:34 +0100 Message-ID: <20241106120309.552193166@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120308.841299741@linuxfoundation.org> References: <20241106120308.841299741@linuxfoundation.org> User-Agent: quilt/0.67 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 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso [ Upstream commit 7515e37bce5c428a56a9b04ea7e96b3f53f17150 ] Existing user space applications maintained by the Osmocom project are breaking since a recent fix that addresses incorrect error checking. Restore operation for user space programs that specify -1 as file descriptor to skip GTPv0 or GTPv1 only sockets. Fixes: defd8b3c37b0 ("gtp: fix a potential NULL pointer dereference") Reported-by: Pau Espin Pedrol Signed-off-by: Pablo Neira Ayuso Tested-by: Oliver Smith Reviewed-by: Simon Horman Link: https://patch.msgid.link/20241022144825.66740-1-pablo@netfilter.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/gtp.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 9b0b22b65cb25..9dd8f66610ce6 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -1263,20 +1263,24 @@ static int gtp_encap_enable(struct gtp_dev *gtp, struct nlattr *data[]) return -EINVAL; if (data[IFLA_GTP_FD0]) { - u32 fd0 = nla_get_u32(data[IFLA_GTP_FD0]); + int fd0 = nla_get_u32(data[IFLA_GTP_FD0]); - sk0 = gtp_encap_enable_socket(fd0, UDP_ENCAP_GTP0, gtp); - if (IS_ERR(sk0)) - return PTR_ERR(sk0); + if (fd0 >= 0) { + sk0 = gtp_encap_enable_socket(fd0, UDP_ENCAP_GTP0, gtp); + if (IS_ERR(sk0)) + return PTR_ERR(sk0); + } } if (data[IFLA_GTP_FD1]) { - u32 fd1 = nla_get_u32(data[IFLA_GTP_FD1]); + int fd1 = nla_get_u32(data[IFLA_GTP_FD1]); - sk1u = gtp_encap_enable_socket(fd1, UDP_ENCAP_GTP1U, gtp); - if (IS_ERR(sk1u)) { - gtp_encap_disable_sock(sk0); - return PTR_ERR(sk1u); + if (fd1 >= 0) { + sk1u = gtp_encap_enable_socket(fd1, UDP_ENCAP_GTP1U, gtp); + if (IS_ERR(sk1u)) { + gtp_encap_disable_sock(sk0); + return PTR_ERR(sk1u); + } } } -- 2.43.0