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,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2061FC433E1 for ; Wed, 17 Jun 2020 11:49:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8A0C2098B for ; Wed, 17 Jun 2020 11:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592394597; bh=SGktHL8v4bUaxnE11zkIKRC5NP2G8l0cI+uxomn/MU8=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=orMpyGRGz3q73/DnWUHP4nOXvQfyNLyq7tLtI1jPW52S0QPlTSHzNUpQtfkrW1Z5R vffln5D+5EC7oWe6P325L1MlvueG5MbxMRpUj6HouM1dtVsUvq5xt1b5OtqAUZHuRH zlHQa6vd+39nJNPYoBgNKwWjkVu49F790sJnnLqc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726597AbgFQLtz (ORCPT ); Wed, 17 Jun 2020 07:49:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:59212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725894AbgFQLtz (ORCPT ); Wed, 17 Jun 2020 07:49:55 -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 682F42098B; Wed, 17 Jun 2020 11:49:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592394594; bh=SGktHL8v4bUaxnE11zkIKRC5NP2G8l0cI+uxomn/MU8=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=1+haDgzUZBvOMdpdBhZ9W5amJUuetI3EiyNrNw7K/AsopZqolAfCjt6ECuMn06iIB omCnTHLmqDswENeS05R08MwhSN9WHJpVIkNIaM0ny2d9lBQ2SpvboScc0aowX4FxB7 Te9pJc8qPCMK7u0PNkTo7Fji+FhSYYis1lr+lRag= Date: Wed, 17 Jun 2020 13:49:46 +0200 From: Greg Kroah-Hartman To: Minchan Kim , Nitin Gupta Cc: Steffen Maier , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Wade Mealing , Sergey Senozhatsky , Jens Axboe Subject: [PATCH v2] Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()" Message-ID: <20200617114946.GA2131650@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200617103412.GA2027053@kroah.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wade Mealing Turns out that the permissions for 0400 really are what we want here, otherwise any user can read from this file. [fixed formatting, added changelog, and made attribute static - gregkh] Reported-by: Wade Mealing Cc: stable Fixes: f40609d1591f ("zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()") Link: https://bugzilla.redhat.com/show_bug.cgi?id=1847832 Signed-off-by: Greg Kroah-Hartman --- v2: fix read/write confusion in the changelog, thanks to Steffen for the review. was more specific as to the changes I made to the original patch. drivers/block/zram/zram_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 6e2ad90b17a3..270dd810be54 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2021,7 +2021,8 @@ static ssize_t hot_add_show(struct class *class, return ret; return scnprintf(buf, PAGE_SIZE, "%d\n", ret); } -static CLASS_ATTR_RO(hot_add); +static struct class_attribute class_attr_hot_add = + __ATTR(hot_add, 0400, hot_add_show, NULL); static ssize_t hot_remove_store(struct class *class, struct class_attribute *attr, -- 2.27.0