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=-11.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=no 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 52581C433E0 for ; Thu, 9 Jul 2020 20:01:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 294A0207DA for ; Thu, 9 Jul 2020 20:01:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gpjQZRBf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726324AbgGIUBM (ORCPT ); Thu, 9 Jul 2020 16:01:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726361AbgGIUBL (ORCPT ); Thu, 9 Jul 2020 16:01:11 -0400 Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EAD5C08E6DC for ; Thu, 9 Jul 2020 13:01:11 -0700 (PDT) Received: by mail-lf1-x141.google.com with SMTP id d21so1887475lfb.6 for ; Thu, 09 Jul 2020 13:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lTuFFx+LM7FvItVugeQGGweyAvmIIEb57TLVDjlPY0c=; b=gpjQZRBfgknPgToKf4jJopWuArBbfyzEqorYF86kvD65J4xt9C2k1qEZRGU/p+ZG5B Ixm+TqJgPxYDtzo7Tork0MgD4E+oSyD9y45vQMzxY2Gl01j5Rw1fKEkdy8Kx7xKkNa7P deM6rEIaRNzGbiTs8yY/ICU7aV11OnW8+vyLE94Wq5coWQTixDsVyBy5A49X19sDUr5B KnRW/U8xrlHgtu63PEPZyeniB8GhjxqRZ5zQnM4HZb6/4pRwOzrLu7qYyysUqedtnhPp vA9UVik+kgCkAKY+6meGwOLcvS5a9RZAKbd69JOjp9GVXoB4hdAI1odoNyp5sqtac8am ZBbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lTuFFx+LM7FvItVugeQGGweyAvmIIEb57TLVDjlPY0c=; b=gUhdk/ol8DOBGwYQJrvXziCwzO1og2MqKjKN3A+P2A76yd9KvhuJaJHj4S9SncpFtc UKln7zZqjVJIVnzeG73aO+D78j0xkFmBh4TG2RsweBKTO2gOGsPr/SDN/au0raB3Xarh vzriBF18fLdGrgIJMwG1UF/t6hbb2pJkOteDOW3ipnJC46IBvHQvPoUVKD+ZbwMLiByx sseSMetQeRdcJwOB958R5R0CtGipP4TY9wNJS+5BqIdGM/LIXXZ8d93Nvx70AyGxuJy6 X2GAkqo79axCaZsbN6H11JimJKTkk9B3gniwGmrChApjlEt3DSDmqsc0C79a//Y/PS6o QOXA== X-Gm-Message-State: AOAM530SdxBSNqR52m4h1rX+zKPCwRpncUgmfUJv3jLc1i2GvvIFqSEC 3eRhFm/a1BNk2dFmXoLFgokWtWCWW9qcDbbLWeVh0g== X-Google-Smtp-Source: ABdhPJzMEObKGztP4FkJdtpJ/jsigQq5atbT70AaZs8psKw5IErg+CIW340AK74bJ/ktHqLM57A7CacQhNPzzfvbILs= X-Received: by 2002:a05:6512:3107:: with SMTP id n7mr42006913lfb.63.1594324868930; Thu, 09 Jul 2020 13:01:08 -0700 (PDT) MIME-Version: 1.0 References: <20200709182642.1773477-1-keescook@chromium.org> <20200709182642.1773477-3-keescook@chromium.org> In-Reply-To: <20200709182642.1773477-3-keescook@chromium.org> From: Jann Horn Date: Thu, 9 Jul 2020 22:00:42 +0200 Message-ID: Subject: Re: [PATCH v7 2/9] pidfd: Add missing sock updates for pidfd_getfd() To: Kees Cook Cc: kernel list , stable , Sargun Dhillon , Christian Brauner , Tycho Andersen , David Laight , Christoph Hellwig , "David S. Miller" , Jakub Kicinski , Alexander Viro , Aleksa Sarai , Matt Denton , Chris Palmer , Robert Sesek , Giuseppe Scrivano , Greg Kroah-Hartman , Andy Lutomirski , Will Drewry , Shuah Khan , Network Development , Linux Containers , Linux API , linux-fsdevel , "open list:KERNEL SELFTEST FRAMEWORK" Content-Type: text/plain; charset="UTF-8" Sender: linux-api-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org On Thu, Jul 9, 2020 at 8:26 PM Kees Cook wrote: > 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. [...] > diff --git a/kernel/pid.c b/kernel/pid.c [...] > @@ -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); > + } __receive_sock() has to be before fd_install(), otherwise `file` can be a dangling pointer.