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 5F787C4332F for ; Tue, 7 Nov 2023 12:37:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235083AbjKGMhQ (ORCPT ); Tue, 7 Nov 2023 07:37:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235183AbjKGMgj (ORCPT ); Tue, 7 Nov 2023 07:36:39 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 904A930F1; Tue, 7 Nov 2023 04:25:38 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C13ADC433C8; Tue, 7 Nov 2023 12:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699359938; bh=J2/ZSTFxMXWZAF9LbVEw/H44CaL0fMQINqnPX0GQpdA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k3UvmaRVC1Jb9k0q7rVl3R5uVe9Oad/fp4rvfofbPKMv3RlqPnPeck1XO509YV9sG o8kfW9SNH0f9xgdoSzENFAmZIAKDgXnXCopvc3F4xCe8c+xxIXy5ZZ1mnI4CMRG5PH YwadOv/5Zis0CvOmOz0Nl66uklbCrqFKG304GDGav987F0YVJ0TWSsLhRjgZyJOgMX Ab8DSBWQdCenO1jDWlPi3pqK4hYOVeVjxxPhDjR42Fx8f29ECANzp7diT+N4NHnDFV +ynmi9T762anMvbuAYK3TKoLTG84qBgiWoca0wW6Uhj7w5zdZnVhe5n4KEZhiFnWjZ SQrJhcYfZGKCA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Philipp Stanner , David Airlie , Kees Cook , Zack Rusin , Sasha Levin , brauner@kernel.org, ddiss@suse.de, nick.alcock@oracle.com, dhowells@redhat.com, code@siddh.me Subject: [PATCH AUTOSEL 6.5 15/37] kernel: watch_queue: copy user-array safely Date: Tue, 7 Nov 2023 07:21:26 -0500 Message-ID: <20231107122407.3760584-15-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107122407.3760584-1-sashal@kernel.org> References: <20231107122407.3760584-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.10 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Philipp Stanner [ Upstream commit ca0776571d3163bd03b3e8c9e3da936abfaecbf6 ] Currently, there is no overflow-check with memdup_user(). Use the new function memdup_array_user() instead of memdup_user() for duplicating the user-space array safely. Suggested-by: David Airlie Signed-off-by: Philipp Stanner Reviewed-by: Kees Cook Reviewed-by: Zack Rusin Signed-off-by: Dave Airlie Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-5-pstanner@redhat.com Signed-off-by: Sasha Levin --- kernel/watch_queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/watch_queue.c b/kernel/watch_queue.c index d0b6b390ee423..778b4056700ff 100644 --- a/kernel/watch_queue.c +++ b/kernel/watch_queue.c @@ -331,7 +331,7 @@ long watch_queue_set_filter(struct pipe_inode_info *pipe, filter.__reserved != 0) return -EINVAL; - tf = memdup_user(_filter->filters, filter.nr_filters * sizeof(*tf)); + tf = memdup_array_user(_filter->filters, filter.nr_filters, sizeof(*tf)); if (IS_ERR(tf)) return PTR_ERR(tf); -- 2.42.0