From patchwork Mon Aug 17 15:17:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266338 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 C26F1C433DF for ; Mon, 17 Aug 2020 17:37:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A157E2063A for ; Mon, 17 Aug 2020 17:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597685833; bh=mI8PCUrsUO9qLk+bSDFKXHpYLx2CG2hsDgwY8dJoT/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Vov2UHkvZLcfYoBPE6o5jjqkZ7S0IHtUxFQgEf7WNVV0K0jhQehR1j4OyCpUsIRzT 5Lr+D6MeJ7HtJTwkKST6Onwc1ElQmFrV9Hp/Q/9rdzbfK8C+AJU4nym2DNhRJWw2Bh HylJ3hPvG5S7bK8Qt6+AWT1ObGPVYYjwBsjIUGSs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731261AbgHQRge (ORCPT ); Mon, 17 Aug 2020 13:36:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:59172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729731AbgHQQRb (ORCPT ); Mon, 17 Aug 2020 12:17:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 710BD204FD; Mon, 17 Aug 2020 16:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597681050; bh=mI8PCUrsUO9qLk+bSDFKXHpYLx2CG2hsDgwY8dJoT/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uqmgqIDiMl+oe6j6OqFWz/1cCPltkRcAR8puS+lRjTCAUU+Niv9o/J2jY5e4K5Z/9 86FeHNe9ruqU3OVXaf1gC7QtkVDZD01/XiJTB4R0f+nwzrNdGYbejzzLkLIuku1dJG qfwiZWUdFqF+4xZkY/PjsYhcbyj+tXO5VtYnnNhY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaohe Lin , "David S. Miller" Subject: [PATCH 4.19 134/168] net: Set fput_needed iff FDPUT_FPUT is set Date: Mon, 17 Aug 2020 17:17:45 +0200 Message-Id: <20200817143740.392546819@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Miaohe Lin [ Upstream commit ce787a5a074a86f76f5d3fd804fa78e01bfb9e89 ] We should fput() file iff FDPUT_FPUT is set. So we should set fput_needed accordingly. Fixes: 00e188ef6a7e ("sockfd_lookup_light(): switch to fdget^W^Waway from fget_light") Signed-off-by: Miaohe Lin Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/socket.c +++ b/net/socket.c @@ -474,7 +474,7 @@ static struct socket *sockfd_lookup_ligh if (f.file) { sock = sock_from_file(f.file, err); if (likely(sock)) { - *fput_needed = f.flags; + *fput_needed = f.flags & FDPUT_FPUT; return sock; } fdput(f);