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=unavailable 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 E3BF6C43603 for ; Wed, 11 Dec 2019 16:04:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0AB32073D for ; Wed, 11 Dec 2019 16:04:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576080285; bh=vJ2u5zoEkcD9bMt34VoLMySskA6MnTSy5Sxos5XHylc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aXeOZSc0hbGdQ5tewlXaQTXMSieqdoAnGpuYydbJRliSI7znL3HkeTedjRPVTX5MF kiApu291+3FMB/4yPrBZudx6wRz1pVN6yXHzdeSV5Z1/5/CcI6vJcID0jZpoWG+x/H R3yAFD5ehnAo+ya7QyPjiya4lALpijnKrlC3W2es= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731382AbfLKQEk (ORCPT ); Wed, 11 Dec 2019 11:04:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:35676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731295AbfLKPNA (ORCPT ); Wed, 11 Dec 2019 10:13:00 -0500 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 9953E2464B; Wed, 11 Dec 2019 15:12:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077179; bh=vJ2u5zoEkcD9bMt34VoLMySskA6MnTSy5Sxos5XHylc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YjyecVvkke6gu2IUiZ9sDZOwMAMxG1bKC1fN7su4h0mKWUY9+SgmKwps7LPAnlziV sqFwWr/TKsTTHsILRrV9sLYuATkMVPqfRbKwNQsL/+Po2UUBo0/wpPwXNN4+DHBAAr jnGuUJFqrT0itDUyAMq6qP25UQ8lwZQUbpJUV5wo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tyrel Datwyler , Bjorn Helgaas , Michael Ellerman , Sasha Levin , linux-pci@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 063/134] PCI: rpaphp: Fix up pointer to first drc-info entry Date: Wed, 11 Dec 2019 10:10:39 -0500 Message-Id: <20191211151150.19073-63-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191211151150.19073-1-sashal@kernel.org> References: <20191211151150.19073-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tyrel Datwyler [ Upstream commit 9723c25f99aff0451cfe6392e1b9fdd99d0bf9f0 ] The first entry of the ibm,drc-info property is an int encoded count of the number of drc-info entries that follow. The "value" pointer returned by of_prop_next_u32() is still pointing at the this value when we call of_read_drc_info_cell(), but the helper function expects that value to be pointing at the first element of an entry. Fix up by incrementing the "value" pointer to point at the first element of the first drc-info entry prior. Signed-off-by: Tyrel Datwyler Acked-by: Bjorn Helgaas Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/1573449697-5448-5-git-send-email-tyreld@linux.ibm.com Signed-off-by: Sasha Levin --- drivers/pci/hotplug/rpaphp_core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 18627bb21e9ec..e3502644a45c3 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c @@ -239,6 +239,8 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name, value = of_prop_next_u32(info, NULL, &entries); if (!value) return -EINVAL; + else + value++; for (j = 0; j < entries; j++) { of_read_drc_info_cell(&info, &value, &drc); -- 2.20.1