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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3F2AC76197 for ; Fri, 19 Jul 2019 03:59:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 719C721852 for ; Fri, 19 Jul 2019 03:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508755; bh=B2ai79gdCChTdskBL7ujMCTfm0Vf3Gs/2lF1bhLaAa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qOFlCEU4v/oztXNP3MQUEUtEU/2AFFFLusZnaC3a87kVIL3jnjmGnQC3dx8oWtF5m FeUgdJtMbojT8aE1KFdiT9WLgd8krJvVc9HjeM47fjRfO5JTDOxUoYG4a6m8rKr+YX Oh33z0zgepclqv1TNUE+7Ayatc8jDAufURRxMu2A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728569AbfGSD7O (ORCPT ); Thu, 18 Jul 2019 23:59:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:58516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728441AbfGSD7E (ORCPT ); Thu, 18 Jul 2019 23:59:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C605821851; Fri, 19 Jul 2019 03:59:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508743; bh=B2ai79gdCChTdskBL7ujMCTfm0Vf3Gs/2lF1bhLaAa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bOfgoOxOdZg87U8nRC/ixQ/LSyyUi6Bynb7/4use0BRxlF7eHWUSKMFlHKHU7nUoR uRlIqWZyINa/9TmOj0TD0bihWAvPyKIS2wRMTvBe/IlTmNbDZwrlHtO4zTDlhtYi/x Qf7rS/SyhJhwBKh+Em3fKGDOIGjI/Rwvp5Ex+1O8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Young Xiao <92siuyang@gmail.com>, Alexandru Ardelean , Jonathan Cameron , Sasha Levin , linux-iio@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 064/171] iio:core: Fix bug in length of event info_mask and catch unhandled bits set in masks. Date: Thu, 18 Jul 2019 23:54:55 -0400 Message-Id: <20190719035643.14300-64-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Young Xiao <92siuyang@gmail.com> [ Upstream commit 936d3e536dcf88ce80d27bdb637009b13dba6d8c ] The incorrect limit for the for_each_set_bit loop was noticed whilst fixing this other case. Note that as we only have 3 possible entries a the moment and the value was set to 4, the bug would not have any effect currently. It will bite fairly soon though, so best fix it now. See commit ef4b4856593f ("iio:core: Fix bug in length of event info_mask and catch unhandled bits set in masks.") for details. Signed-off-by: Young Xiao <92siuyang@gmail.com> Reviewed-by: Alexandru Ardelean Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/industrialio-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 245b5844028d..2da099badce6 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -1104,6 +1104,8 @@ static int iio_device_add_info_mask_type_avail(struct iio_dev *indio_dev, char *avail_postfix; for_each_set_bit(i, infomask, sizeof(*infomask) * 8) { + if (i >= ARRAY_SIZE(iio_chan_info_postfix)) + return -EINVAL; avail_postfix = kasprintf(GFP_KERNEL, "%s_available", iio_chan_info_postfix[i]); -- 2.20.1