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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 F0134C3A5A3 for ; Tue, 27 Aug 2019 08:02:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC82520828 for ; Tue, 27 Aug 2019 08:02:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892934; bh=Ds0GimJ/SUxb9WfKAQynFvWDWWY0JTVWRQ3x7JEx6EU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Woz1BvYlKA7LX/m4BgLAGZlGT1LGS0id6aYgpBQ3Y9izisBJsLLHjjOBcdveq/gKf h9iPGbGXqtSczi0zOVinGIq9/QGfaXeT22QB3Na747o/nOc6+11/bgXqIC+9rXPsom 4yloCL0lLF+koEX+xf/nfl5dHOM//gfgZK94GZlY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731881AbfH0ICN (ORCPT ); Tue, 27 Aug 2019 04:02:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:58464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731080AbfH0IBx (ORCPT ); Tue, 27 Aug 2019 04:01:53 -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 97F0721872; Tue, 27 Aug 2019 08:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566892912; bh=Ds0GimJ/SUxb9WfKAQynFvWDWWY0JTVWRQ3x7JEx6EU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pgpPZm5SsitRYjzDs2fEmE/NfVa1ljD/1WnWV1YEqg6AOTzwlRkiBpZsOBOkrY3ax 0jPe7Oz3sRYQo6UhOqJSmWiTITa8Sj7zSriCEv4SOLw94F22w136On3Gtp7K7wnyKD nEgN+Iofz0hNGDOj5QUgoJSjYKtSmhuY65CtVIPk= 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 , Sasha Levin Subject: [PATCH 5.2 055/162] nvmem: Use the same permissions for eeprom as for nvmem Date: Tue, 27 Aug 2019 09:49:43 +0200 Message-Id: <20190827072740.113392117@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190827072738.093683223@linuxfoundation.org> References: <20190827072738.093683223@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 [ Upstream commit e70d8b287301eb6d7c7761c6171c56af62110ea3 ] 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 Signed-off-by: Sasha Levin --- drivers/nvmem/nvmem-sysfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/nvmem/nvmem-sysfs.c b/drivers/nvmem/nvmem-sysfs.c index 6f303b91f6e70..9e0c429cd08a2 100644 --- a/drivers/nvmem/nvmem-sysfs.c +++ b/drivers/nvmem/nvmem-sysfs.c @@ -224,10 +224,17 @@ int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem, 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 -- 2.20.1