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.0 required=3.0 tests=BAYES_00,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=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 4E99DC433E7 for ; Mon, 20 Jul 2020 16:13:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2345220734 for ; Mon, 20 Jul 2020 16:13:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261630; bh=5kQgW893kvwiQkao3qEeDZboLFX8pKd+Euhfgy+Luhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OrMrRtCsiG3/qVQ7HfhJrjEJny/3EIRiubQGFo2268MuXl0inhz4p3cGC+MET0jEh F74rKsB31zCQtH0KGXus6h+3CebYF23CsSajRB+Op0c2HrOWfb0bHNkHVEUPkeZWcO 2d0dG1VMShHIY0L+fQ4cL/Uq/cyNn2tdX5+ltL+w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388163AbgGTQNt (ORCPT ); Mon, 20 Jul 2020 12:13:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:53916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388159AbgGTQNs (ORCPT ); Mon, 20 Jul 2020 12:13:48 -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 4D1282065E; Mon, 20 Jul 2020 16:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261627; bh=5kQgW893kvwiQkao3qEeDZboLFX8pKd+Euhfgy+Luhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wybknsa2BbXyIefNspVk+xQyH5yvlE3NvG5vBmhOcSFXTAodnWlqfagdEAF+rIL2v 38BIk6amw6fHeqRh+qhRQVZEsPg1TR8tTAELV+rFMrLS85T1j0Blzi6FCHoUZxkISh LoKS4iyCk2KDEgmFGhtmMLq7r3OyKO1qJwcJonj4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wade Mealing , Steffen Maier , Minchan Kim Subject: [PATCH 5.7 185/244] Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()" Date: Mon, 20 Jul 2020 17:37:36 +0200 Message-Id: <20200720152834.640903022@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152825.863040590@linuxfoundation.org> References: <20200720152825.863040590@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wade Mealing commit 853eab68afc80f59f36bbdeb715e5c88c501e680 upstream. 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 Reviewed-by: Steffen Maier Acked-by: Minchan Kim Link: https://lore.kernel.org/r/20200617114946.GA2131650@kroah.com Signed-off-by: Greg Kroah-Hartman --- drivers/block/zram/zram_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2025,7 +2025,8 @@ static ssize_t hot_add_show(struct 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,