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 A6D4BC433EF for ; Tue, 19 Apr 2022 14:33:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353351AbiDSOfs (ORCPT ); Tue, 19 Apr 2022 10:35:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353444AbiDSOfr (ORCPT ); Tue, 19 Apr 2022 10:35:47 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57B381DA7C for ; Tue, 19 Apr 2022 07:33:03 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7FAC92129B; Tue, 19 Apr 2022 14:33:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1650378781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=95gmZ+IeFKkHL6H6bLyyQ0iXUlQOXJcr5vuMwdX6V/k=; b=FsrRwiNc+k5cWAfyYoEdMauTcmBwqj9SoK+AH/ePfZIcHJH+O6f82WzCaiiTlxrLikQLSS 1dtENYsV9WraDAEpKtBxSnJejq3r+IieWvnsCcaV1kXa7h0akG90i2EnYTszGtyH5Ir2i2 scCv1B/I9QAQGZR6uteQdJc3jCzTHGU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1650378781; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=95gmZ+IeFKkHL6H6bLyyQ0iXUlQOXJcr5vuMwdX6V/k=; b=XOHNYfqSyTmMiJHoAMXdkZ5XzjE3fXroSt0pzgO23+nfMUFgmDsXhwLXJWKT78kryTKoAC sJ/S6uYd2gofPADg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 59296132E7; Tue, 19 Apr 2022 14:33:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Uy5HFB3IXmI3IwAAMHmgww (envelope-from ); Tue, 19 Apr 2022 14:33:01 +0000 Date: Tue, 19 Apr 2022 16:32:55 +0200 From: David Disseldorp To: David Howells Cc: linux-fsdevel@vger.kernel.org Subject: Re: [PATCH] watch_queue: fix IOC_WATCH_QUEUE_SET_SIZE alloc error paths Message-ID: <20220419163255.03e210eb@suse.de> In-Reply-To: <20220404181318.21c0740a@suse.de> References: <20220328145746.8146-1-ddiss@suse.de> <20220404181318.21c0740a@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Ping... On Mon, 4 Apr 2022 18:13:18 +0200, David Disseldorp wrote: > Hi David, > > Any feedback on this? It's a pretty obvious fix IMO. > > On Mon, 28 Mar 2022 16:57:46 +0200, David Disseldorp wrote: > > > From code inspection, the watch_queue_set_size() allocation error paths > > return the ret value set via the prior pipe_resize_ring() call, which > > will always be zero. > > > > Fixes: c73be61cede58 ("pipe: Add general notification queue support") > > Signed-off-by: David Disseldorp > > --- > > kernel/watch_queue.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c > > index 3990e4df3d7b0..a128dedec9db2 100644 > > --- a/kernel/watch_queue.c > > +++ b/kernel/watch_queue.c > > @@ -248,6 +248,7 @@ long watch_queue_set_size(struct pipe_inode_info *pipe, unsigned int nr_notes) > > if (ret < 0) > > goto error; > > > > + ret = -ENOMEM; > > pages = kcalloc(sizeof(struct page *), nr_pages, GFP_KERNEL); > > if (!pages) > > goto error; >