From patchwork Thu Jul 9 18:26:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11654923 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 7C7A214F6 for ; Thu, 9 Jul 2020 18:28:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 607C5207DD for ; Thu, 9 Jul 2020 18:28:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="YU79DjoI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726196AbgGIS0t (ORCPT ); Thu, 9 Jul 2020 14:26:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726245AbgGIS0t (ORCPT ); Thu, 9 Jul 2020 14:26:49 -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 42040C08E763 for ; Thu, 9 Jul 2020 11:26:49 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id o13so1343802pgf.0 for ; Thu, 09 Jul 2020 11:26:49 -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=bbOsfemkppItMRL9baKJDrdeIT9dav/5vOG4sh+GTJw=; b=YU79DjoIN/w7y5TyqFO3ZzDnsrj2BCinthNc2lfzih0B5hSlbM9EPloRGc7GUGLZ0o 6JCSijpWAwERecVO9M0iG7unm7ZYrZrnPJPNyO9Oco+db4Slc8o+2SvXhQzFecZDzV3x uE470OnBMx34GKCyElA8NXtqGTnzpolwAW8kQ= 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=bbOsfemkppItMRL9baKJDrdeIT9dav/5vOG4sh+GTJw=; b=DNbVW32jTN8QZ+UDgBLf7OFz8pL1pW1Sz1qA/afAQ/LUUzcrbjdwlI0WHqIbEA8S2F dRwsvlZevmdGUMceyPGWxAVvQAQQYjbQe+T2aUHAiTrXfmrzZy/xiMA0Ur4PJuYCSvUa VZVZAAC5Sxt1ODBoZkMMCEvg+A1bxKY7VLVrqtDm+CsO+6fqKwV7yrrrixNsDPztrAYl S2oJMTv+Bef9fIM9fvdBOpzOFR8YC/MGTZSWuUElRi8LIeUgwkU524UIMqNJTYhnli3R Nbxy00gqkT6c5uKCObcKiE27CkDWeA0yQDnmypOTVUNaDAdpYS2wFnmO+4rZh3K4oBCl nSIw== X-Gm-Message-State: AOAM5323Y0/VcjRAsd3sVKfQcJDg+Jw+UKm0ZHJ4P6On7PBGpdIXTpLB ZsLagXPFZoSuoxU33PJLH1y6Bg== X-Google-Smtp-Source: ABdhPJzltdn89rhN6XYfPiPOe4yMRQPDF/YkLsmF+9nfEb0qXub5V6RSRyXpBK142NIdo+LNFAx+Tw== X-Received: by 2002:a63:9212:: with SMTP id o18mr37331988pgd.347.1594319208450; Thu, 09 Jul 2020 11:26:48 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id h1sm3436654pgn.41.2020.07.09.11.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 11:26:47 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , stable@vger.kernel.org, Sargun Dhillon , 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 2/9] pidfd: Add missing sock updates for pidfd_getfd() Date: Thu, 9 Jul 2020 11:26:35 -0700 Message-Id: <20200709182642.1773477-3-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-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The sock counting (sock_update_netprioidx() and sock_update_classid()) was missing from pidfd's implementation of received fd installation. Add a call to the new __receive_sock() helper. Cc: stable@vger.kernel.org Fixes: 8649c322f75c ("pid: Implement pidfd_getfd syscall") Signed-off-by: Kees Cook --- kernel/pid.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/pid.c b/kernel/pid.c index f1496b757162..85ed00abdc7c 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -42,6 +42,7 @@ #include #include #include +#include struct pid init_struct_pid = { .count = REFCOUNT_INIT(1), @@ -642,10 +643,12 @@ static int pidfd_getfd(struct pid *pid, int fd) } ret = get_unused_fd_flags(O_CLOEXEC); - if (ret < 0) + if (ret < 0) { fput(file); - else + } else { fd_install(ret, file); + __receive_sock(file); + } return ret; }