commit 6c52daf91779b01e54f50816bf3eb8f5d9035414
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Tue Nov 10 21:04:57 2020 +0100

    Linux 4.9.243
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 04533793ac10b38103d3aefe1c4b5b1eaf009f35
Author: Len Brown <len.brown@intel.com>
Date:   Tue Nov 10 13:00:00 2020 -0800

    powercap: restrict energy meter to root access
    
    commit 949dd0104c496fa7c14991a23c03c62e44637e71 upstream.
    
    Remove non-privileged user access to power data contained in
    /sys/class/powercap/intel-rapl*/*/energy_uj
    
    Non-privileged users currently have read access to power data and can
    use this data to form a security attack. Some privileged
    drivers/applications need read access to this data, but don't expose it
    to non-privileged users.
    
    For example, thermald uses this data to ensure that power management
    works correctly. Thus removing non-privileged access is preferred over
    completely disabling this power reporting capability with
    CONFIG_INTEL_RAPL=n.
    
    Fixes: 95677a9a3847 ("PowerCap: Fix mode for energy counter")
    Signed-off-by: Len Brown <len.brown@intel.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>