From patchwork Thu Jul 9 18:26:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11654903 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 20CFB60D for ; Thu, 9 Jul 2020 18:27:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05A3F207DD for ; Thu, 9 Jul 2020 18:27:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="L8wvdwHt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726896AbgGIS1c (ORCPT ); Thu, 9 Jul 2020 14:27:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726809AbgGIS0y (ORCPT ); Thu, 9 Jul 2020 14:26:54 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A58FCC08C5CE for ; Thu, 9 Jul 2020 11:26:53 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id g67so1322145pgc.8 for ; Thu, 09 Jul 2020 11:26:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JrMTIMXp8JCVs/UG6kwzV643qisCcMSwknnEo4LkN2s=; b=L8wvdwHte5JVfRo/XP6SiecvNSKuxO96e3Iw4DgEORXlBX29wHcKcTekzMu5ehRLxC PIZpkxQVThGY9I3o0Km+Zf3dqPVcYYFtmIF38pEP/OnDYBtw9U/C/nd8IeDdy4CeBbvR knaPAcSaS1ZiArDzFLG+JuglPL174w7ZWohI8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JrMTIMXp8JCVs/UG6kwzV643qisCcMSwknnEo4LkN2s=; b=nFOqjRmre7xIcTTmWhz+BcVZ3kWwPg1AdRF3sPxtKlTRA90qCAGSxsktiA2n6N+9bP K51dyrC/fMmbTzw+R+UC/LgQe1olURA7MhxMbI+WYjajlRLljd3PWZcXdJBmcrK6HvDd DBXpmubGcoyfPwgMZbZ3mUIc0vn68O0bjTsbGvTsPJIpTigJtyBFdHIR867pPoN0Yl4W u2V+P3bsgaN+ymVhAHobz5gL481vvcTFUSAIKOxf8OAPjjRtigONCw3eiv37dyT9iOnA puHtT4lcHT4vuqwlocmu/7Rz6AV5fB8zL5OMb+ZLw2HMlv2dNerPkv0biXL5L2Tw6T9T J5sA== X-Gm-Message-State: AOAM533kGqV0wVwzFxE+boyRjXAOELUHHSGfIDpITJtUrA6ngH3Jt1Go FOEZ2aq/bYJQsAy1c9GW+b6DXw== X-Google-Smtp-Source: ABdhPJx65UJ0x1t95RO9v7FuFc02woWGGDxWRTXPyPbUQ6AMj/WGTj8FXr741XZhs+0+z7kyxYCdSA== X-Received: by 2002:a63:1f11:: with SMTP id f17mr53506078pgf.217.1594319213298; Thu, 09 Jul 2020 11:26:53 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id l191sm3238744pfd.149.2020.07.09.11.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 11:26:51 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , Sargun Dhillon , Christian Brauner , Christian Brauner , Tycho Andersen , David Laight , Christoph Hellwig , "David S. Miller" , Jakub Kicinski , Alexander Viro , Aleksa Sarai , Matt Denton , Jann Horn , Chris Palmer , Robert Sesek , Giuseppe Scrivano , Greg Kroah-Hartman , Andy Lutomirski , Will Drewry , Shuah Khan , netdev@vger.kernel.org, containers@lists.linux-foundation.org, linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v7 6/9] pidfd: Replace open-coded receive_fd() Date: Thu, 9 Jul 2020 11:26:39 -0700 Message-Id: <20200709182642.1773477-7-keescook@chromium.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709182642.1773477-1-keescook@chromium.org> References: <20200709182642.1773477-1-keescook@chromium.org> MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Replace the open-coded version of receive_fd() with a call to the new helper. Thanks to Vamshi K Sthambamkadi for catching a missed fput() in an earlier version of this patch. Reviewed-by: Sargun Dhillon Acked-by: Christian Brauner Signed-off-by: Kees Cook --- kernel/pid.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/kernel/pid.c b/kernel/pid.c index 85ed00abdc7c..da5aea5f04fa 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -636,19 +636,8 @@ static int pidfd_getfd(struct pid *pid, int fd) if (IS_ERR(file)) return PTR_ERR(file); - ret = security_file_receive(file); - if (ret) { - fput(file); - return ret; - } - - ret = get_unused_fd_flags(O_CLOEXEC); - if (ret < 0) { - fput(file); - } else { - fd_install(ret, file); - __receive_sock(file); - } + ret = receive_fd(file, O_CLOEXEC); + fput(file); return ret; }