Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp194966pxf; Thu, 25 Mar 2021 01:41:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyei/nUa27YdysB8p6NYDr0dRAF5xXdNuNVfdgDLqW2+IG3nkekraQpJrydsF5Cig7Z+g8j X-Received: by 2002:a17:906:c45a:: with SMTP id ck26mr7979553ejb.125.1616661677191; Thu, 25 Mar 2021 01:41:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616661677; cv=none; d=google.com; s=arc-20160816; b=OBp+PcGfPFlARILqwgYCFQknv75WzGHtMPheEP7VFKVPSWI2MfXL4n3HMrQv7nGxwU usiBvEEAwqH5iFhQTim2b7g+T0XAAV+efZ6dQkvkA8uRluXEMs/j0H1jLXzoPsDD+UGM 3U9DMIYUTffVguQDqiTFGZ6DDVdGGf6H6yv4zT4hWRwccYIMH4UuF1/QT4lO+Fq8RuFj AddneB3I7wGEOxZMgJjEYpBdN4zLfwmKPMjWDVwAvt0aiRvVKp7MxDwZYlFgxcSKcbgk RwzLt7nonXH8NfRL/GN9YKax5dbTQ9dmFcRx9ZQRtx7Ne0TvV2cUPg7R8aKPvOlQZsVr Wx1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=VwOuyI56GlvW3rCYXhRpDBuCCpSG71MlHG14V3Z53vQ=; b=FaUWeSP95aWmgIeDo9j+eAdnaP0e4oCUteycMKQ2lbBuCE+q7D9No2w5oxewhW1WiL U5Xv7HJBxcDmgU8m7xL4BTDiJ3xRmRNg8Gv0yY5MJ56quOTbDHFYcAy3ZM65IwOFZQv9 Lsjsyd4CPMNZ5e4ylrI0F+tViRv/x+hOG5av9MmrdygpNUiYqfGh2sTjy4sdDVdlFAwK FcoMybT32rls6Al0/0ooUneEyJHLxVsv0rvUHeM1dHDuEe9jWRYySP94pmymCdFvznp1 oL7Ku7+B3+rXSclJX/PH4ZEIHPTGEODeEy+j7N/lk7i747Dt0tUoV54Md34Hb5yRcxuX 5CHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="fzjB58/m"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cx18si3693104ejb.543.2021.03.25.01.40.54; Thu, 25 Mar 2021 01:41:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="fzjB58/m"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229592AbhCYIjz (ORCPT + 99 others); Thu, 25 Mar 2021 04:39:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:56008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbhCYIjc (ORCPT ); Thu, 25 Mar 2021 04:39:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 17E09619FC; Thu, 25 Mar 2021 08:39:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616661572; bh=Nn2Jcv819TwFo7idy1EDIUI0hC6JZl8FR/VnF46+dAs=; h=From:To:Cc:Subject:Date:From; b=fzjB58/mMkdetAG2DUodmx4z/aTXZVCCOgbCoBg6lr22xv5inJelHrVOkfaPIoqEo 01ki6HAF5IujAtG7PBgmeaXXFXjieEgqgUejpn0ap1Nc5585jhhRfeqrq6yTRLbMxB DyFfXeAz1T7gU5y6vEf1EHG1PTVVWEqwVowEiHdEXv8PYHxe8ebojBPojcs/c4Zc68 MwqDSKJbMZOXyGV3gXFXc2YgGd9177VDwmyi7COXtXUBj7sollk2EjYNklzMko5jv3 E0yYcEBixhgB3c6+JjgdrWEpn4g6ClvcH+3ZUiezGfEfmE+HrTul5pcOwelchn4o8Q uRhbjEcaD3L2A== From: Christian Brauner To: Jan Kara , Amir Goldstein Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Brauner Subject: [PATCH] fanotify_user: use upper_32_bits() to verify mask Date: Thu, 25 Mar 2021 09:37:43 +0100 Message-Id: <20210325083742.2334933-1-brauner@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Patch-Hashes: v=1; h=sha256; i=rV9DYAGqrBf84r/PvZ7PvFiRieUiTS332qKv+sF3M/Q=; m=u8tAo1c2Johpj/6wlhfYIK/O9fj5xWHs290nbl91tJA=; p=0i8coRLdVQPAx3eF5AqlJR9QPc2ttbnOFB0cU2euChg=; g=0279421931c80ebb10d6b34605ab0d3d166d0bfc X-Patch-Sig: m=pgp; i=christian.brauner@ubuntu.com; s=0x0x91C61BC06578DCA2; b=iHUEABYKAB0WIQRAhzRXHqcMeLMyaSiRxhvAZXjcogUCYFxLYQAKCRCRxhvAZXjcog/lAPwMZQ8 eCaX8/fs1p5JKDfagK35WK9xrGpXk5SV+nvxp/AEApnZF/kCXAL1T+opmSPt71VlVXVatn7dRT2YY gZDfNAs= Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian Brauner I don't see an obvious reason why the upper 32 bit check needs to be open-coded this way. Switch to upper_32_bits() which is more idiomatic and should conceptually be the same check. Cc: Amir Goldstein Cc: Jan Kara Signed-off-by: Christian Brauner --- fs/notify/fanotify/fanotify_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 9e0c1afac8bd..d5683fa9d495 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -1126,7 +1126,7 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask, __func__, fanotify_fd, flags, dfd, pathname, mask); /* we only use the lower 32 bits as of right now. */ - if (mask & ((__u64)0xffffffff << 32)) + if (upper_32_bits(mask)) return -EINVAL; if (flags & ~FANOTIFY_MARK_FLAGS) base-commit: 0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b -- 2.27.0