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 1D6A0C433E3 for ; Thu, 9 Jul 2020 20:01:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E83EE207DF for ; Thu, 9 Jul 2020 20:01:17 +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 S1726361AbgGIUBP (ORCPT ); Thu, 9 Jul 2020 16:01:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726445AbgGIUBL (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 5E21FC08E81E for ; Thu, 9 Jul 2020 13:01:11 -0700 (PDT) Received: by mail-lf1-x141.google.com with SMTP id k17so1904780lfg.3 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=e3l2CzjF5jyDHPrpO0qS9PlkbHdj1UUEGBkp6XodNpYjTbuXGk1l/jDivKy3m3TjjE ggfuNZ+Z3L1+SQdrsGzUdOB1cFF1QR/d2XRJVOou3y10hRsZxoEQ5YHlh9HdTUM44Nsh wMegnOC3y2JTTH5PjRWFwl+gSakjNM0qoECrZ0UYU/RX/OR8m0DcPfAheHQ3MY8NNZys UqpkX0oo80+JGmJqOKNioWb7Rd0CuG2P/SRTaGSmVCFwU2SSE1TOSjHkIlWYroiKLY2n aw4yh5VxtnzSQVhK9lI/lCQjbND7v/oUVwpa7TMkgfFr3s6sUY+HOeVXRSipx+AFDLO9 Ty1A== X-Gm-Message-State: AOAM533lyET3s2iQefBjli3ePcBAWX1oVsb9ndZaE++IKax/gp0iuqBB vFxKDROgotR8aROVWieykZNiJYyiXgO1QlmBUdnFwg== 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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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.