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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 34F70C4CEC4 for ; Wed, 18 Sep 2019 06:23:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C45E218AF for ; Wed, 18 Sep 2019 06:23:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568787834; bh=f3pz0wBcdIZTPNDTsokruoT4VSOl8JlnLUNWPpj3bv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KNJ0UQB2eKWuyU1cJcDyhwnF28Xrh1pD96JpcvfNtrM6qfewev2pwJhEgNGju3/dt 9ZX69WU1Eyf96mhv95MIGat3PjBFsguOD6r9tHjXlh4wH2Y89nUxQqNsgx2TyDSu+Z waMvHfR/gBB8+kDHcXOt4tq1/DB44sDTJmEQbJLk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729727AbfIRGXx (ORCPT ); Wed, 18 Sep 2019 02:23:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:44116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729706AbfIRGXu (ORCPT ); Wed, 18 Sep 2019 02:23:50 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 E8AAA218AF; Wed, 18 Sep 2019 06:23:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568787829; bh=f3pz0wBcdIZTPNDTsokruoT4VSOl8JlnLUNWPpj3bv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CZWewUhQsV92SGuQm8xVxytAwnHxhUeZGYW3dT0ORB6lcMEIEi9e+LIFQv5NJWtPB k30lcXsjT7+eky+98GoWkozl+M3Do+xCK96Eii+34wCyDxfjN1/7wBpgNi7mu5++cP 6Al1XQzqDqidfDbpxJRZngfPuEWHB8liIEgZwhVU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jean Delvare , Bartosz Golaszewski , Andrew Lunn , Srinivas Kandagatla , Arnd Bergmann Subject: [PATCH 4.19 49/50] nvmem: Use the same permissions for eeprom as for nvmem Date: Wed, 18 Sep 2019 08:19:32 +0200 Message-Id: <20190918061228.737809169@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061223.116178343@linuxfoundation.org> References: <20190918061223.116178343@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Jean Delvare commit e70d8b287301eb6d7c7761c6171c56af62110ea3 upstream. The compatibility "eeprom" attribute is currently root-only no matter what the configuration says. The "nvmem" attribute does respect the setting of the root_only configuration bit, so do the same for "eeprom". Signed-off-by: Jean Delvare Fixes: b6c217ab9be6 ("nvmem: Add backwards compatibility support for older EEPROM drivers.") Reviewed-by: Bartosz Golaszewski Cc: Andrew Lunn Cc: Srinivas Kandagatla Cc: Arnd Bergmann Link: https://lore.kernel.org/r/20190728184255.563332e6@endymion Signed-off-by: Greg Kroah-Hartman --- drivers/nvmem/core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -415,10 +415,17 @@ static int nvmem_setup_compat(struct nvm if (!config->base_dev) return -EINVAL; - if (nvmem->read_only) - nvmem->eeprom = bin_attr_ro_root_nvmem; - else - nvmem->eeprom = bin_attr_rw_root_nvmem; + if (nvmem->read_only) { + if (config->root_only) + nvmem->eeprom = bin_attr_ro_root_nvmem; + else + nvmem->eeprom = bin_attr_ro_nvmem; + } else { + if (config->root_only) + nvmem->eeprom = bin_attr_rw_root_nvmem; + else + nvmem->eeprom = bin_attr_rw_nvmem; + } nvmem->eeprom.attr.name = "eeprom"; nvmem->eeprom.size = nvmem->size; #ifdef CONFIG_DEBUG_LOCK_ALLOC