From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3740796-1524035781-2-3329845763552011019 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no ("Email failed DMARC policy for domain") X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org' X-Spam-charsets: X-IgnoreVacation: yes ("Email failed DMARC policy for domain") X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1524035780; b=LmDQmsDJtc9ZeUfVqWDrG+IbjQpOS46bA4R/UJsubUKfYV/Bme VOfR4NxYzwOQO959gBVhV1aS/UQ3M8wMW2lmHrmGvReas1xXNdnO/1euIJTOwqDd Y8VCHYUtx22tzaYc/x9/F1S9sbHytZCZycUGN/HBL6DelVKGoiU9Kuxfnw07nGk0 rgq5kpqzhXMukrIONVTLV7x/CihifTi8+MKVy25+0wg69hARz27HPsjwYIkXj4qt MXFFSvbR4IUSABj9YL+A/Kx5dXLqWqrytZUzuR0RD2dnijFFxDn99SeSoMoSlFH+ pS/8KnXUnnvVy/accH16+J6Ub9yy76aQCh0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id:sender :list-id; s=fm2; t=1524035780; bh=uontePt4hHponKmwcnDxHmNyswoJTT HPEXQQiCss9I8=; b=ORy/Dq7dmxX9AXmx4rD/PZ7KYHabGE19/pJ0LXIakStb/H GOSmFFUKPu1G7/1DGKYfJJuSGGMb1sShwXP5lpbCoHBz93qXGE3Mm4/EXjdjvYIf +IrJQFenuxL/ZRDyEDShIAmfmvUUpEn5LG9p3l2ZU7s4aupl4mSXFmnlzR92Zcq+ z2nAToYu4V/ViBMIZbfQy5JcM2bV7H5DEkM21OEeE5vcMBJPC1Hdn+dOuHdxS8Hk Qt1slXwAd6erjoXTJLb8brB2pc2pEz8ujlAqLRGGuKsZykfuHIp90Qn0DJBFQ0bv /V+E4JwivuuQyAwqz5lyNUtcNeDBHE/qy4uVdKfw== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=linux.ibm.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linux.ibm.com header.result=pass header_org.domain=ibm.com header_org.result=pass header_is_org_domain=no; x-vs=clean score=0 state=0 Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=fail (p=none,has-list-id=yes,d=none) header.from=linux.ibm.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linux.ibm.com header.result=pass header_org.domain=ibm.com header_org.result=pass header_is_org_domain=no; x-vs=clean score=0 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfOl7tNZCfL57l/qQyLeyKGoPc3L72GL5cb+nVI91r3J6xiUtN4lNk152YUr3OPlRTmCcwXyJD91hyc9SI0AwlW4CfS0BdfjGEKtqf8J/AF0w+hwjXTCR VQMrnWCgwAr7KvFKjl6uVBjoxLeerGa6g+LLndd1rIXtRHyHQunxlq29vBP62Vua49+JYBdkbCsbr866i7gV1N6AytFD0wOzmrkWfT30pLtLJBdwxrt1aEaO X-CM-Analysis: v=2.3 cv=WaUilXpX c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=Kd1tUaAdevIA:10 a=VwQbUJbxAAAA:8 a=Z4Rwk6OoAAAA:8 a=VnNF1IyMAAAA:8 a=4hirlG-2ErW7RMWNpGEA:9 a=u3UmXl6KXYH4Rq_5:21 a=EG6H3jZADBN0eKMQ:21 a=AjGcO6oz07-iQ99wixmX:22 a=HkZW87K1Qel5hWWM3VKY:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753252AbeDRHO7 (ORCPT ); Wed, 18 Apr 2018 03:14:59 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:60148 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753250AbeDRHO4 (ORCPT ); Wed, 18 Apr 2018 03:14:56 -0400 From: Thomas Richter To: jeyu@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Cc: borntraeger@de.ibm.com, schwidefsky@de.ibm.com, brueckner@linux.vnet.ibm.com, heiko.carstens@de.ibm.com, peterz@infradead.org, acme@kernel.org, me@tobin.cc, keescook@chromium.org, stable@vger.kernel.org, Thomas Richter Subject: [PATCH v3] module: Fix display of wrong module .text address Date: Wed, 18 Apr 2018 09:14:36 +0200 X-Mailer: git-send-email 2.13.5 X-TM-AS-GCONF: 00 x-cbid: 18041807-0008-0000-0000-000004EC8C62 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18041807-0009-0000-0000-00001E8094DD Message-Id: <20180418071436.21392-1-tmricht@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-04-18_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1804180067 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Reading file /proc/modules shows the correct address: [root@s35lp76 ~]# cat /proc/modules | egrep '^qeth_l2' qeth_l2 94208 1 - Live 0x000003ff80401000 and reading file /sys/module/qeth_l2/sections/.text [root@s35lp76 ~]# cat /sys/module/qeth_l2/sections/.text 0x0000000018ea8363 displays a random address. This breaks the perf tool which uses this address on s390 to calculate start of .text section in memory. Fix this by printing the correct (unhashed) address. Thanks to Jessica Yu for helping on this. Fixes: ef0010a30935 ("vsprintf: don't use 'restricted_pointer()' when not restricting") Cc: # v4.15+ Suggested-by: Linus Torvalds Signed-off-by: Thomas Richter Cc: Jessica Yu --- kernel/module.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/module.c b/kernel/module.c index a6e43a5806a1..40b42000bd80 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1472,7 +1472,8 @@ static ssize_t module_sect_show(struct module_attribute *mattr, { struct module_sect_attr *sattr = container_of(mattr, struct module_sect_attr, mattr); - return sprintf(buf, "0x%pK\n", (void *)sattr->address); + return sprintf(buf, "0x%px\n", kptr_restrict < 2 ? + (void *)sattr->address : NULL); } static void free_sect_attrs(struct module_sect_attrs *sect_attrs) -- 2.14.3