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 58F36C001DE for ; Thu, 20 Jul 2023 00:57:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229765AbjGTA5Z (ORCPT ); Wed, 19 Jul 2023 20:57:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229450AbjGTA5X (ORCPT ); Wed, 19 Jul 2023 20:57:23 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59CB91FFD for ; Wed, 19 Jul 2023 17:57:22 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6862842a028so139940b3a.0 for ; Wed, 19 Jul 2023 17:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1689814642; x=1690419442; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=EoHtEDrUeDBB6O4dpqwH1+7TO2wrwXezIfRG5JlgQeA=; b=HmFTN0EwsP6KRPllj+z4z2bLlOlTq/BZzzaYMsJEsRv9VPqwYghrsiQdsmGZ+ju1Ra zC8lIiM9aAqWbNFYdKVZjYVwvt9gSlEz9y9mVETd3tkyZnNxdDv2xRWqgiobP+V0fI5j wgLnyXwRMC1FsO2fPNMMYbmtVkYK3lx2HMD70= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689814642; x=1690419442; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EoHtEDrUeDBB6O4dpqwH1+7TO2wrwXezIfRG5JlgQeA=; b=hmTC1OI/HZWggztZS0S9DKox8GCu9NYgnrUvuehJtgiXCzHB7rPUSi4o/9PmR0pz2Y 1ffXzyG9669GLxhm1Tl6uky30/yhnSfohaIONcHimOm3Dob9sbTCAePqe/5bLs4eHVJi p5/telcsMuCVWCOuC3cl6TSgEQoCeIG1hkZaFm6Pmgx3Tw2+nUwpks6YQlpvpGLfeB6f ylQLDKarXnTKD9ftUKUXT2qOjkX4xTah29DaFql8dRulwbOT938p4csHyPU1MNyyPc51 6Ap78QsBPNPWKPX0p94r5IhrilMmq4SgiOvBmJ4BXkwPlbiMvQrZJeV1W97wHSF/ZwAk l0tA== X-Gm-Message-State: ABy/qLbqYmQdlirPI5VFJlZi+gJym+wC92BmQXPTFTvGSU5Dws6YnDfD E+BO3uts4Me16TPy7NJ3JwUg9A== X-Google-Smtp-Source: APBJJlGsN20HjU3kjOqIjW2vhq/ZUqU5m4b6w3IXK5ZmIdaMhUVcZM72TXBPKTPM+HJYkNgFq0kGgw== X-Received: by 2002:a05:6a20:144f:b0:133:2974:d31a with SMTP id a15-20020a056a20144f00b001332974d31amr4281643pzi.17.1689814641824; Wed, 19 Jul 2023 17:57:21 -0700 (PDT) Received: from google.com (KD124209188001.ppp-bb.dion.ne.jp. [124.209.188.1]) by smtp.gmail.com with ESMTPSA id x4-20020a170902ec8400b001b895a9f3acsm4603603plg.224.2023.07.19.17.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 17:57:21 -0700 (PDT) Date: Thu, 20 Jul 2023 09:57:17 +0900 From: Sergey Senozhatsky To: Ricardo Ribalda Cc: Laurent Pinchart , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, stable@kernel.org Subject: Re: [PATCH] media: uvcvideo: Fix OOB read Message-ID: <20230720005717.GD57770@google.com> References: <20230717-uvc-oob-v1-1-f5b9b4aba3b4@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230717-uvc-oob-v1-1-f5b9b4aba3b4@chromium.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On (23/07/19 12:05), Ricardo Ribalda wrote: > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index 5e9d3da862dd..5e3af66a2223 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -1402,6 +1402,9 @@ int uvc_query_v4l2_menu(struct uvc_video_chain *chain, > query_menu->id = id; > query_menu->index = index; > > + if (index >= UVC_MAX_MENU) > + return -EINVAL; We probably can just do if (index >= BITS_PER_TYPE(mapping->menu_mask)) return -EINVAL; This should be better than using a hard-coded constant or even BITS_PER_LONG (which is still a hard-coded constant). Because BITS_PER_LONG won't get us covered if one day ->menu_mask data type changes.