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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 C0E8DC433E7 for ; Mon, 12 Oct 2020 13:33:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B11B20878 for ; Mon, 12 Oct 2020 13:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509597; bh=0BeFLgFqdU3EcsLD1F/sJ6++72ggvfkwP3dYbDM0IPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vovPio2jXO59u6UxGAKUgZtn2/XT+rpj/T2AMkdyP6ToaxgEzRhB3pnS8JSuVdi9u f4APzYENXhjBBgnLk6ogSCSSKE4cDSjhslqdPLA4+fpvHBwos/m0CdVMwZOYMG5gKE 2DKr2eKi4Cl+MZ+1xot2bw/uNNA1wKT4PIHdc/qI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389129AbgJLNdQ (ORCPT ); Mon, 12 Oct 2020 09:33:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:35198 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389059AbgJLNdH (ORCPT ); Mon, 12 Oct 2020 09:33:07 -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 42717221EB; Mon, 12 Oct 2020 13:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509586; bh=0BeFLgFqdU3EcsLD1F/sJ6++72ggvfkwP3dYbDM0IPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YrPjHUl8HVbje0v8arv8eMxcWJS1C8vFjY5w1pqcKXcvhQIEpV6SYKomnr2JkcQCM goVfnZsUc+wGvGiGYYrNEZRykxsz9A9bTX4iX6xvJfPijZsxQYpCMeX8Mv/6n+NHS/ PO2sBXWruKkVL5Ys/q020asAo/gsYDtmkH3BfofI= 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.4 38/39] rxrpc: Fix server keyring leak Date: Mon, 12 Oct 2020 15:27:08 +0200 Message-Id: <20201012132629.911556969@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132628.130632267@linuxfoundation.org> References: <20201012132628.130632267@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/ar-key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/rxrpc/ar-key.c +++ b/net/rxrpc/ar-key.c @@ -897,7 +897,7 @@ int rxrpc_request_key(struct rxrpc_sock _enter(""); - if (optlen <= 0 || optlen > PAGE_SIZE - 1) + if (optlen <= 0 || optlen > PAGE_SIZE - 1 || rx->securities) return -EINVAL; description = kmalloc(optlen + 1, GFP_KERNEL);