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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56C1AC433F5 for ; Wed, 30 Mar 2022 06:30:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243342AbiC3Ga4 (ORCPT ); Wed, 30 Mar 2022 02:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231327AbiC3Gae (ORCPT ); Wed, 30 Mar 2022 02:30:34 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39BD511C1C for ; Tue, 29 Mar 2022 23:28:49 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id m3so34014791lfj.11 for ; Tue, 29 Mar 2022 23:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+058yQ0rk1dSz4lOGrP1Pz3rRM6fvoBLkVgOS4k3umk=; b=CHuPaTr7VHK4xZuxnF9F3hsYr0aHjZPaHruOVyc2QxKzUQa0aa9p0oScHfUrczNu6j 9yH3SvjIIFljkwbchTKgwGdQ4b/iETvyDMJay5BuI1nDNDrlTotTD28NAnmKrXWUic0A XdQkuc6Qmcwjwzm46QNtw6BY087qsZZ43ZsEU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+058yQ0rk1dSz4lOGrP1Pz3rRM6fvoBLkVgOS4k3umk=; b=DtRFdCMpUvEBwqVu4JuIap/xgqkEyvrMxu3fFAj0hANHARIKNeLanyu/n/kV9PYuhi Hk+gbdyxrVTjaBIhF+wTsq5kK1YMZcclBskmMXadlRrgTSYBB4vvuVNc/2z/ptSPxhfh Ht6KH3yXZx2wFED6sgp5FEu8325WC1bJaVbmhn+afQYmbsIF86WbgYtubc3v13rRbzt4 6xv1fu8xJEPk/s3IVM3IbfEFkhqR9Hvec68yU3pwiAuVL3JR9mfAcANK5nQI6D0LIa+P aXb6FALwFi7MOCv1WfHV/JUXZdqcyiy8JAd5IUIyig7IFcTKurwD+EgqvOZWins5TsIf 3Hkg== X-Gm-Message-State: AOAM531mgwgfme5vmN+LlLCIY0+cLmdkhkE5h8Ga89Nd2Qldej0FPGVW kZV1pZKWKVMMHM+hbFtJe7OquxR/mLhvzgqo X-Google-Smtp-Source: ABdhPJyPwT0GcgqRt3bPBC/78AutTIZvuqa0SMC+hfTeQ7OfRHmbZePhVDgYKB7PGb+gn/SFQ/ZXLw== X-Received: by 2002:a05:6512:230b:b0:44a:7d29:4636 with SMTP id o11-20020a056512230b00b0044a7d294636mr5683611lfu.307.1648621724411; Tue, 29 Mar 2022 23:28:44 -0700 (PDT) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com. [209.85.208.172]) by smtp.gmail.com with ESMTPSA id y26-20020a19915a000000b0044a0356abc4sm2219451lfj.220.2022.03.29.23.28.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Mar 2022 23:28:43 -0700 (PDT) Received: by mail-lj1-f172.google.com with SMTP id q5so26322620ljb.11 for ; Tue, 29 Mar 2022 23:28:42 -0700 (PDT) X-Received: by 2002:a05:651c:1213:b0:247:e2d9:cdda with SMTP id i19-20020a05651c121300b00247e2d9cddamr5743894lja.443.1648621722263; Tue, 29 Mar 2022 23:28:42 -0700 (PDT) MIME-Version: 1.0 References: <20220326114009.1690-1-aissur0002@gmail.com> <2698031.BEx9A2HvPv@fedor-zhuzhzhalka67> <4705670.GXAFRqVoOG@fedor-zhuzhzhalka67> In-Reply-To: From: Linus Torvalds Date: Tue, 29 Mar 2022 23:28:26 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 4/4] file: Fix file descriptor leak in copy_fd_bitmaps() To: "Jason A. Donenfeld" Cc: Fedor Pchelkin , Alexey Khoroshilov , Eric Biggers , Christian Brauner , Alexander Viro , linux-fsdevel , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 29, 2022 at 11:21 PM Jason A. Donenfeld wrote: > > Yep, that works: Ok, I'll apply that asap. I think the "do this better" version is to get rid of count_open_files() and moving all the logic into sane_fdtable_size(), and you end up with something like this: static unsigned int sane_fdtable_size(struct fdtable *fdt, unsigned int max_fds) { unsigned int i; max_fds = min(max_fds, fdt->max_fds); i = (max_fds + BITS_PER_LONG - 1) / BITS_PER_LONG; while (i > 0) { if (fdt->open_fds[--i]) break; } return (i + 1) * BITS_PER_LONG; } but considering that I couldn't even get the simple ALIGN() in the right place, I think going with the obvious version I should have picked originally is the way to go.. Linus