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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 B2664C169C4 for ; Tue, 29 Jan 2019 11:47:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83DB82083B for ; Tue, 29 Jan 2019 11:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762465; bh=ypSa13DR2XMcIZO8ITrVlhb/rFNQne15vCEV891CN/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aFTufRZHtESMlgnu4Hw2ErqHkqhSa38kVvd0ic8Rz1zN6ckTVt5hPmzLUvstHK0mw GvSQS9KOjuoxVSAniv23ydkY/HWriFn2d3aaoZr4ELh7WQQqvQZjLdcCdalrilEX7L QgAdQvxmqIYSRKv+JjCkrfeARPego/DEFK/UeRW0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731055AbfA2Lqp (ORCPT ); Tue, 29 Jan 2019 06:46:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:37300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731017AbfA2Lqj (ORCPT ); Tue, 29 Jan 2019 06:46:39 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 708BB21874; Tue, 29 Jan 2019 11:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762398; bh=ypSa13DR2XMcIZO8ITrVlhb/rFNQne15vCEV891CN/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FAk5lgUchptzPX4pDC8sVWauTjZsucUJzfYF2SABL9wBx5OR/xvzuKwQx2OKIVlxZ YjKz6niU9JtggD4q/U09KyV3AbgO9hIHdLTg5FIoYIPrpwwXAoKiqqpnn1xVLHhuaj Avc/LSqZEKqjsbixuqKDl/EEGkND2P1urbNwks9E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stuart hayes , Jeff Moyer , Dan Williams Subject: [PATCH 4.19 061/103] acpi/nfit: Block function zero DSMs Date: Tue, 29 Jan 2019 12:35:38 +0100 Message-Id: <20190129113204.339577731@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129113159.567154026@linuxfoundation.org> References: <20190129113159.567154026@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Williams commit 5e9e38d0db1d29efed1dd4cf9a70115d33521be7 upstream. In preparation for using function number 0 as an error value, prevent it from being considered a valid function value by acpi_nfit_ctl(). Cc: Cc: stuart hayes Fixes: e02fb7264d8a ("nfit: add Microsoft NVDIMM DSM command set...") Reported-by: Jeff Moyer Reviewed-by: Jeff Moyer Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/nfit/core.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -1764,6 +1764,13 @@ static int acpi_nfit_add_dimm(struct acp return 0; } + /* + * Function 0 is the command interrogation function, don't + * export it to potential userspace use, and enable it to be + * used as an error value in acpi_nfit_ctl(). + */ + dsm_mask &= ~1UL; + guid = to_nfit_uuid(nfit_mem->family); for_each_set_bit(i, &dsm_mask, BITS_PER_LONG) if (acpi_check_dsm(adev_dimm->handle, guid,