From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.15,063/146] x86/MCE: Serialize sysfs changes From: Greg Kroah-Hartman Message-Id: <20180313152325.538700825@linuxfoundation.org> Date: Tue, 13 Mar 2018 16:23:50 +0100 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Seunghun Han , Borislav Petkov , Thomas Gleixner , Tony Luck , linux-edac List-ID: NC4xNS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBTZXVuZ2h1biBI YW4gPGtrYW1hZ3VpQGdtYWlsLmNvbT4KCmNvbW1pdCBiM2I3YzQ3OTVjY2FiNWJlNzFmMDgwNzc0 YzQ1YmJiY2M3NWMyYWFmIHVwc3RyZWFtLgoKVGhlIGNoZWNrX2ludGVydmFsIGZpbGUgaW4KCiAg L3N5cy9kZXZpY2VzL3N5c3RlbS9tYWNoaW5lY2hlY2svbWFjaGluZWNoZWNrPGNwdSBudW1iZXI+ CgpkaXJlY3RvcnkgaXMgYSBnbG9iYWwgdGltZXIgdmFsdWUgZm9yIE1DRSBwb2xsaW5nLiBJZiBp dCBpcyBjaGFuZ2VkIGJ5IG9uZQpDUFUsIG1jZV9yZXN0YXJ0KCkgYnJvYWRjYXN0cyB0aGUgZXZl bnQgdG8gb3RoZXIgQ1BVcyB0byBkZWxldGUgYW5kIHJlc3RhcnQKdGhlIE1DRSBwb2xsaW5nIHRp bWVyIGFuZCBfX21jaGVja19jcHVfaW5pdF90aW1lcigpIHJlaW5pdGlhbGl6ZXMgdGhlCm1jZV90 aW1lciB2YXJpYWJsZS4KCklmIG1vcmUgdGhhbiBvbmUgQ1BVIHdyaXRlcyBhIHNwZWNpZmljIHZh bHVlIHRvIHRoZSBjaGVja19pbnRlcnZhbCBmaWxlCmNvbmN1cnJlbnRseSwgbWNlX3RpbWVyIGlz IG5vdCBwcm90ZWN0ZWQgZnJvbSBzdWNoIGNvbmN1cnJlbnQgYWNjZXNzZXMgYW5kCmFsbCBraW5k cyBvZiBleHBsb3Npb25zIGhhcHBlbi4gU2luY2Ugb25seSByb290IGNhbiB3cml0ZSB0byB0aG9z ZSBzeXNmcwp2YXJpYWJsZXMsIHRoZSBpc3N1ZSBpcyBub3QgYSBiaWcgZGVhbCBzZWN1cml0eS13 aXNlLgoKSG93ZXZlciwgY29uY3VycmVudCB3cml0ZXMgdG8gdGhlc2UgY29uZmlndXJhdGlvbiB2 YXJpYWJsZXMgaXMgdm9pZCBvZgpyZWFzb24gc28gdGhlIHByb3BlciB0aGluZyB0byBkbyBpcyB0 byBzZXJpYWxpemUgdGhlIGFjY2VzcyB3aXRoIGEgbXV0ZXguCgpCb3JpczoKCiAtIE1ha2Ugc3Rv cmVfaW50X3dpdGhfcmVzdGFydCgpIHVzZSBkZXZpY2Vfc3RvcmVfdWxvbmcoKSB0byBmaWx0ZXIg b3V0CiAgIG5lZ2F0aXZlIGludGVydmFscwogLSBMaW1pdCBtaW4gaW50ZXJ2YWwgdG8gMSBzZWNv bmQKIC0gQ29ycmVjdCBsb2NraW5nCiAtIE1hc3NhZ2UgY29tbWl0IG1lc3NhZ2UKClNpZ25lZC1v ZmYtYnk6IFNldW5naHVuIEhhbiA8a2thbWFndWlAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBC b3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+ClNpZ25lZC1vZmYtYnk6IFRob21hcyBHbGVpeG5l ciA8dGdseEBsaW51dHJvbml4LmRlPgpDYzogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGlu dXhmb3VuZGF0aW9uLm9yZz4KQ2M6IFRvbnkgTHVjayA8dG9ueS5sdWNrQGludGVsLmNvbT4KQ2M6 IGxpbnV4LWVkYWMgPGxpbnV4LWVkYWNAdmdlci5rZXJuZWwub3JnPgpDYzogc3RhYmxlQHZnZXIu a2VybmVsLm9yZwpMaW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMjAxODAzMDIyMDI3MDYu OTQzNC0xLWtrYW1hZ3VpQGdtYWlsLmNvbQpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRt YW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGFyY2gveDg2L2tlcm5lbC9jcHUv bWNoZWNrL21jZS5jIHwgICAyMiArKysrKysrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdl ZCwgMjEgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKCgotLQpUbyB1bnN1YnNjcmliZSBm cm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4K dGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBt YWpvcmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5o dG1sCgotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2UuYworKysgYi9hcmNoL3g4 Ni9rZXJuZWwvY3B1L21jaGVjay9tY2UuYwpAQCAtNTcsNiArNTcsOSBAQAogCiBzdGF0aWMgREVG SU5FX01VVEVYKG1jZV9sb2dfbXV0ZXgpOwogCisvKiBzeXNmcyBzeW5jaHJvbml6YXRpb24gKi8K K3N0YXRpYyBERUZJTkVfTVVURVgobWNlX3N5c2ZzX211dGV4KTsKKwogI2RlZmluZSBDUkVBVEVf VFJBQ0VfUE9JTlRTCiAjaW5jbHVkZSA8dHJhY2UvZXZlbnRzL21jZS5oPgogCkBAIC0yMDgwLDYg KzIwODMsNyBAQCBzdGF0aWMgc3NpemVfdCBzZXRfaWdub3JlX2NlKHN0cnVjdCBkZXZpCiAJaWYg KGtzdHJ0b3U2NChidWYsIDAsICZuZXcpIDwgMCkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKKwltdXRl eF9sb2NrKCZtY2Vfc3lzZnNfbXV0ZXgpOwogCWlmIChtY2FfY2ZnLmlnbm9yZV9jZSBeICEhbmV3 KSB7CiAJCWlmIChuZXcpIHsKIAkJCS8qIGRpc2FibGUgY2UgZmVhdHVyZXMgKi8KQEAgLTIwOTIs NiArMjA5Niw4IEBAIHN0YXRpYyBzc2l6ZV90IHNldF9pZ25vcmVfY2Uoc3RydWN0IGRldmkKIAkJ CW9uX2VhY2hfY3B1KG1jZV9lbmFibGVfY2UsICh2b2lkICopMSwgMSk7CiAJCX0KIAl9CisJbXV0 ZXhfdW5sb2NrKCZtY2Vfc3lzZnNfbXV0ZXgpOworCiAJcmV0dXJuIHNpemU7CiB9CiAKQEAgLTIx MDQsNiArMjExMCw3IEBAIHN0YXRpYyBzc2l6ZV90IHNldF9jbWNpX2Rpc2FibGVkKHN0cnVjdAog CWlmIChrc3RydG91NjQoYnVmLCAwLCAmbmV3KSA8IDApCiAJCXJldHVybiAtRUlOVkFMOwogCisJ bXV0ZXhfbG9jaygmbWNlX3N5c2ZzX211dGV4KTsKIAlpZiAobWNhX2NmZy5jbWNpX2Rpc2FibGVk IF4gISFuZXcpIHsKIAkJaWYgKG5ldykgewogCQkJLyogZGlzYWJsZSBjbWNpICovCkBAIC0yMTE1 LDYgKzIxMjIsOCBAQCBzdGF0aWMgc3NpemVfdCBzZXRfY21jaV9kaXNhYmxlZChzdHJ1Y3QKIAkJ CW9uX2VhY2hfY3B1KG1jZV9lbmFibGVfY2UsIE5VTEwsIDEpOwogCQl9CiAJfQorCW11dGV4X3Vu bG9jaygmbWNlX3N5c2ZzX211dGV4KTsKKwogCXJldHVybiBzaXplOwogfQogCkBAIC0yMTIyLDgg KzIxMzEsMTkgQEAgc3RhdGljIHNzaXplX3Qgc3RvcmVfaW50X3dpdGhfcmVzdGFydChzdAogCQkJ CSAgICAgIHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLAogCQkJCSAgICAgIGNvbnN0IGNo YXIgKmJ1Ziwgc2l6ZV90IHNpemUpCiB7Ci0Jc3NpemVfdCByZXQgPSBkZXZpY2Vfc3RvcmVfaW50 KHMsIGF0dHIsIGJ1Ziwgc2l6ZSk7CisJdW5zaWduZWQgbG9uZyBvbGRfY2hlY2tfaW50ZXJ2YWwg PSBjaGVja19pbnRlcnZhbDsKKwlzc2l6ZV90IHJldCA9IGRldmljZV9zdG9yZV91bG9uZyhzLCBh dHRyLCBidWYsIHNpemUpOworCisJaWYgKGNoZWNrX2ludGVydmFsID09IG9sZF9jaGVja19pbnRl cnZhbCkKKwkJcmV0dXJuIHJldDsKKworCWlmIChjaGVja19pbnRlcnZhbCA8IDEpCisJCWNoZWNr X2ludGVydmFsID0gMTsKKworCW11dGV4X2xvY2soJm1jZV9zeXNmc19tdXRleCk7CiAJbWNlX3Jl c3RhcnQoKTsKKwltdXRleF91bmxvY2soJm1jZV9zeXNmc19tdXRleCk7CisKIAlyZXR1cm4gcmV0 OwogfQogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELsUdIWg8OfIEtbeKH2za1DjAAgw336Zq7KefEPkhYX7Ai1bnVyHBospZYJsUp7POuRUM3mE ARC-Seal: i=1; a=rsa-sha256; t=1520955027; cv=none; d=google.com; s=arc-20160816; b=obww8UxfPNFghsALLaW8FPeMsnBDvwinIDr3/KLwi39j+PN6rYugOXinFSevm4Mp+2 QublO2Amu4CdORrzt5CfmLAXo94Nhvh8TbNXcNcoyWp+k3d6CfstpkQ/+uOuIBID+a5l xqJVzlcT+Wg0ZegmhiwU6Of2wHzOtqdg7gTSq79jrMQtP+Nt3rs5O1TCwttYjmGFq7Fs y4XZStvhj9h+MUHOqC3WNhrJ6cKv8619Vb8zW0GovJzRgBTdJsOQYrHErM5OxmnJsFy5 1tzrFASmpJs9Fm/zn/h6m3bvH+blMezcULOs0ZK2qAzu8FxUFWXK0yUNIMeRZELL7p0q sB7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=MggX8I0DqhOznG62aVkyG2rApj0QzHa4If+c1vdM1r4=; b=i8L6vjwamyjnlGgd7f/c8V78A9xgmMMF9QN6kQTn4ZLIvPDvUV+uDW2aTx0JYFu4ZC bl8U5Dt3ZI7KGMvQwotdOdP6AvVb5H68Q5kajdKXydNJ4bxX9SvJx0dqAbwSyq0gx4yQ T0SlFm3uvfW23oZ/lLIaMWgMwrL2v7cx+ScQkIBHwyF1Dc/C1RJNw8XNvHg+d6bDX99j lKQXaBzAkj9LbcaifApmz1vDTzKPDLxwiZiIcU5bLt+hBF4mxE4bN+iB0jVwYB/I9e08 jEAOY9UgvaKlIOsh4q3ciAC7QkSXhLcbzW7pesbwZOhB5WH0Rt3i2IPHIuv4A0KCL+2z vfGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Seunghun Han , Borislav Petkov , Thomas Gleixner , Tony Luck , linux-edac Subject: [PATCH 4.15 063/146] x86/MCE: Serialize sysfs changes Date: Tue, 13 Mar 2018 16:23:50 +0100 Message-Id: <20180313152325.538700825@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180313152320.439085687@linuxfoundation.org> References: <20180313152320.439085687@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1594836939155963397?= X-GMAIL-MSGID: =?utf-8?q?1594836939155963397?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Seunghun Han commit b3b7c4795ccab5be71f080774c45bbbcc75c2aaf upstream. The check_interval file in /sys/devices/system/machinecheck/machinecheck directory is a global timer value for MCE polling. If it is changed by one CPU, mce_restart() broadcasts the event to other CPUs to delete and restart the MCE polling timer and __mcheck_cpu_init_timer() reinitializes the mce_timer variable. If more than one CPU writes a specific value to the check_interval file concurrently, mce_timer is not protected from such concurrent accesses and all kinds of explosions happen. Since only root can write to those sysfs variables, the issue is not a big deal security-wise. However, concurrent writes to these configuration variables is void of reason so the proper thing to do is to serialize the access with a mutex. Boris: - Make store_int_with_restart() use device_store_ulong() to filter out negative intervals - Limit min interval to 1 second - Correct locking - Massage commit message Signed-off-by: Seunghun Han Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Cc: Greg Kroah-Hartman Cc: Tony Luck Cc: linux-edac Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20180302202706.9434-1-kkamagui@gmail.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mcheck/mce.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -57,6 +57,9 @@ static DEFINE_MUTEX(mce_log_mutex); +/* sysfs synchronization */ +static DEFINE_MUTEX(mce_sysfs_mutex); + #define CREATE_TRACE_POINTS #include @@ -2080,6 +2083,7 @@ static ssize_t set_ignore_ce(struct devi if (kstrtou64(buf, 0, &new) < 0) return -EINVAL; + mutex_lock(&mce_sysfs_mutex); if (mca_cfg.ignore_ce ^ !!new) { if (new) { /* disable ce features */ @@ -2092,6 +2096,8 @@ static ssize_t set_ignore_ce(struct devi on_each_cpu(mce_enable_ce, (void *)1, 1); } } + mutex_unlock(&mce_sysfs_mutex); + return size; } @@ -2104,6 +2110,7 @@ static ssize_t set_cmci_disabled(struct if (kstrtou64(buf, 0, &new) < 0) return -EINVAL; + mutex_lock(&mce_sysfs_mutex); if (mca_cfg.cmci_disabled ^ !!new) { if (new) { /* disable cmci */ @@ -2115,6 +2122,8 @@ static ssize_t set_cmci_disabled(struct on_each_cpu(mce_enable_ce, NULL, 1); } } + mutex_unlock(&mce_sysfs_mutex); + return size; } @@ -2122,8 +2131,19 @@ static ssize_t store_int_with_restart(st struct device_attribute *attr, const char *buf, size_t size) { - ssize_t ret = device_store_int(s, attr, buf, size); + unsigned long old_check_interval = check_interval; + ssize_t ret = device_store_ulong(s, attr, buf, size); + + if (check_interval == old_check_interval) + return ret; + + if (check_interval < 1) + check_interval = 1; + + mutex_lock(&mce_sysfs_mutex); mce_restart(); + mutex_unlock(&mce_sysfs_mutex); + return ret; }