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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 734D1C43467 for ; Mon, 12 Oct 2020 13:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 203292076E for ; Mon, 12 Oct 2020 13:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510062; bh=VG9CSanfmLO4eHxmZo/+noXJhoJKQEcs8kV3iIYycxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RFDxQ7J9lKed3uGf0+Xj4ZtZf6e7ZbW6KnbBEr3r3CRA9nQAKusuur/Gjm3b5/41a PPS7EC3mGf6vOc7RsaxDMLilLVJxwQwsXEXzZUK1+7fVh/Z65bo4KstKB3uQcZVkqf Ks8mjo/+5pBBEXLAGrc0f0ywHTkf937Vslbc2wVU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389026AbgJLNlA (ORCPT ); Mon, 12 Oct 2020 09:41:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:43804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731459AbgJLNjw (ORCPT ); Mon, 12 Oct 2020 09:39:52 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D25B20678; Mon, 12 Oct 2020 13:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509991; bh=VG9CSanfmLO4eHxmZo/+noXJhoJKQEcs8kV3iIYycxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nxHyktmhhtae6vAYSKe85ArBd9EMB3b6dzftSuJ2W+SwvioVraFx7/BrI/Bt/QnoK 7yaDzeZwkf8l+fmgl+zFaxZrLRSDv4Uw/o0m363+xC7UWfsZNoT+xtleS6h/ZBi6YM 7soJ81g7UyqdD4vYd8gr2e/RZnPcqsSe/rsYsaSs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Howells , Sasha Levin Subject: [PATCH 4.19 45/49] rxrpc: Fix server keyring leak Date: Mon, 12 Oct 2020 15:27:31 +0200 Message-Id: <20201012132631.478883436@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132629.469542486@linuxfoundation.org> References: <20201012132629.469542486@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Howells [ Upstream commit 38b1dc47a35ba14c3f4472138ea56d014c2d609b ] If someone calls setsockopt() twice to set a server key keyring, the first keyring is leaked. Fix it to return an error instead if the server key keyring is already set. Fixes: 17926a79320a ("[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both") Signed-off-by: David Howells Signed-off-by: Sasha Levin --- net/rxrpc/key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c index 1fe203c56faf0..2fe2add62a8ed 100644 --- a/net/rxrpc/key.c +++ b/net/rxrpc/key.c @@ -905,7 +905,7 @@ int rxrpc_request_key(struct rxrpc_sock *rx, char __user *optval, int optlen) _enter(""); - if (optlen <= 0 || optlen > PAGE_SIZE - 1) + if (optlen <= 0 || optlen > PAGE_SIZE - 1 || rx->securities) return -EINVAL; description = memdup_user_nul(optval, optlen); -- 2.25.1