Message ID | 20230320230534.50174-1-bgray@linux.ibm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1489984wrt; Mon, 20 Mar 2023 16:32:52 -0700 (PDT) X-Google-Smtp-Source: AK7set/mV8KA8etsLxt8f1uN/hhty2y1UrCQgQbvzXgMNwd7IrRcSH7u3K6HzVvLQnBqBvRpHerU X-Received: by 2002:a05:6a20:6d03:b0:da:6e45:6056 with SMTP id fv3-20020a056a206d0300b000da6e456056mr159875pzb.43.1679355172260; Mon, 20 Mar 2023 16:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679355172; cv=none; d=google.com; s=arc-20160816; b=fvF52012UcafYSkird/9Pg/oFL3B07Z9MtKkN9q5D2afwGJ7DVshoHtPbiEOYZvinq VwOWw2tVN7HWRAk4mrThl1EymzJgYMvCueBm3A00eHaaIzEaIL4XP+q1nGXNkmBsy/VB qC3nXoQ6JMRrqRL7WWWjWaR4UOf+xbRl9euhPrFqEK/DG3LMr1nLL0z9+1BPdr+0wa3E xYwF6LiLN4XaSfWqrqTNl6CAeUSGneZjXvVKvGf0bSagYlVUO4k/IGgrosI2RAZlncCS l52KQjzlPUwH7b3RSSy7+YJQYTRKPd0df3MLKPgqdB9O5xlikMsbqsArX6q5t74Pc5tX X9YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=/axE91rUg/cJj4LJMDVEwCwWQ5EZAkcEoYjeNyf1wIk=; b=UIPWksMsJFQEkhO/197qTI9L6+uKp2v2RCcuSY8UnsUzrg3smP17b0l6V6V1CHHRPQ 7qxSu32J0H0NU+uSRkXdXNI0DLyc1fLyyEVAN+E1AKJa2XzfQ6esKqyILYz9VybMdiA+ JiLKYuQdpedgnSWRRuCDLyCjnN2J0haw1ONcdnyL+hbjBWPnQZ8Ow/hSv3qFN/DPl519 IXb01vr0we9nffdsNM7m4QjRxrFsmYZ6rs0+NjEcCjldLXEcGRQ+HeXVkIWWkik1HyEV uGXaJrnJRsRBRerN4JwqowqiUlVs0lW2+F7lHrtWRK9GaGcH2A4kEJPL1SeG16OFG/sH dxbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=JDeNfhBF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i10-20020a63cd0a000000b00507281fb21fsi11554409pgg.557.2023.03.20.16.32.36; Mon, 20 Mar 2023 16:32:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=JDeNfhBF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229989AbjCTXGT (ORCPT <rfc822;pusanteemu@gmail.com> + 99 others); Mon, 20 Mar 2023 19:06:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229980AbjCTXGP (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 20 Mar 2023 19:06:15 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FFEE34F6C; Mon, 20 Mar 2023 16:06:02 -0700 (PDT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32KLhc3O012069; Mon, 20 Mar 2023 23:06:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : mime-version; s=pp1; bh=/axE91rUg/cJj4LJMDVEwCwWQ5EZAkcEoYjeNyf1wIk=; b=JDeNfhBFRy0/5ZPXqmZxo6nnWgQw8LiXU0Tt/qNX1LFqj3/znE+DVgP97ZEdJxVK5gzP PL4U6PWrCC3b4hjFYk74mgmBKTuVKhE8Mq+WqdzwCtm+gpn+ulo1WKKu5hds9MBUalv2 Z0KCdktfN1q0hUiSVC5CCl6YHrdVMPUwTm3DkfIpuX73JVl7U0FoTz/ikvxQlVEq0DyZ 7urhil97gfHBqgsszWw8YUi/3Xh3NUOx/29A6Wzapa4z+8Kp7GaPfCpTL4rGNaIUheJb Jzt7g8JU3piBjmUtrLsrQZlqYcsqGVQhWKTYRcfGZVLFTshFetxTklHfoS6JGLiRfJvp Kw== Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pest044rr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 23:06:01 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32KLVcNo017002; Mon, 20 Mar 2023 23:06:00 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3pd4jfb881-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 Mar 2023 23:06:00 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32KN5vW320578838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 Mar 2023 23:05:57 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 794B220043; Mon, 20 Mar 2023 23:05:57 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EE2462004E; Mon, 20 Mar 2023 23:05:56 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 20 Mar 2023 23:05:56 +0000 (GMT) Received: from bgray-lenovo-p15.ibm.com (unknown [9.177.79.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 42948600F5; Tue, 21 Mar 2023 10:05:51 +1100 (AEDT) From: Benjamin Gray <bgray@linux.ibm.com> To: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: Benjamin Gray <bgray@linux.ibm.com> Subject: [PATCH] init/initramfs: Fix argument forwarding to panic() in panic_show_mem() Date: Tue, 21 Mar 2023 10:05:34 +1100 Message-Id: <20230320230534.50174-1-bgray@linux.ibm.com> X-Mailer: git-send-email 2.39.2 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Ww-6Jq3H909M665UBrFCdaSd7ClcJV7y X-Proofpoint-ORIG-GUID: Ww-6Jq3H909M665UBrFCdaSd7ClcJV7y Content-Transfer-Encoding: 8bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-20_16,2023-03-20_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 mlxlogscore=999 impostorscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 adultscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303200196 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760931528968679274?= X-GMAIL-MSGID: =?utf-8?q?1760931528968679274?= |
Series |
init/initramfs: Fix argument forwarding to panic() in panic_show_mem()
|
|
Commit Message
Benjamin Gray
March 20, 2023, 11:05 p.m. UTC
Forwarding variadic argument lists can't be done by passing a va_list
to a function with signature foo(...) (as panic() has). It ends up
interpreting the va_list itself as a single argument instead of
iterating it. printf() happily accepts it of course, leading to corrupt
output.
Convert panic_show_mem() to a macro to allow forwarding the arguments.
The function is trivial enough that it's easier than trying to introduce
a vpanic() variant.
Signed-off-by: Benjamin Gray <bgray@linux.ibm.com>
---
After sending these patches [1] I wondered why the kernel accepted a
corrupt archive. The streaming parser makes it difficult to see
where to add a completeness check (possibly can assert the state is
Start or Reset at the end?), but adding an error() to cover my issue
revealed that the error message was never printed.
[1]: https://lore.kernel.org/all/20230320040839.660475-1-bgray@linux.ibm.com/
---
init/initramfs.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
base-commit: 065ffaee73892e8a3629b4cfbe635697807a3c6f
prerequisite-patch-id: 6e3cfc6bf9c5686ad29c7feed8e283d30b1957fd
prerequisite-patch-id: 933a7bd2f29223dba7f2cac7e9aa72aae730292d
Comments
On Tue, 2023-03-21 at 10:05 +1100, Benjamin Gray wrote: > Forwarding variadic argument lists can't be done by passing a va_list > to a function with signature foo(...) (as panic() has). It ends up > interpreting the va_list itself as a single argument instead of > iterating it. printf() happily accepts it of course, leading to > corrupt > output. > > Convert panic_show_mem() to a macro to allow forwarding the > arguments. > The function is trivial enough that it's easier than trying to > introduce > a vpanic() variant. > > Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
On Tue, Mar 21, 2023 at 8:06 AM Benjamin Gray <bgray@linux.ibm.com> wrote: > > Forwarding variadic argument lists can't be done by passing a va_list > to a function with signature foo(...) (as panic() has). It ends up > interpreting the va_list itself as a single argument instead of > iterating it. printf() happily accepts it of course, leading to corrupt > output. > > Convert panic_show_mem() to a macro to allow forwarding the arguments. > The function is trivial enough that it's easier than trying to introduce > a vpanic() variant. > > Signed-off-by: Benjamin Gray <bgray@linux.ibm.com> Applied to linux-kbuild. Thanks. > > --- > > After sending these patches [1] I wondered why the kernel accepted a > corrupt archive. The streaming parser makes it difficult to see > where to add a completeness check (possibly can assert the state is > Start or Reset at the end?), but adding an error() to cover my issue > revealed that the error message was never printed. > > [1]: https://lore.kernel.org/all/20230320040839.660475-1-bgray@linux.ibm.com/ > --- > init/initramfs.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/init/initramfs.c b/init/initramfs.c > index f6c112e30bd4..e7a01c2ccd1b 100644 > --- a/init/initramfs.c > +++ b/init/initramfs.c > @@ -60,15 +60,8 @@ static void __init error(char *x) > message = x; > } > > -static void panic_show_mem(const char *fmt, ...) > -{ > - va_list args; > - > - show_mem(0, NULL); > - va_start(args, fmt); > - panic(fmt, args); > - va_end(args); > -} > +#define panic_show_mem(fmt, ...) \ > + ({ show_mem(0, NULL); panic(fmt, ##__VA_ARGS__); }) > > /* link hash */ > > > base-commit: 065ffaee73892e8a3629b4cfbe635697807a3c6f > prerequisite-patch-id: 6e3cfc6bf9c5686ad29c7feed8e283d30b1957fd > prerequisite-patch-id: 933a7bd2f29223dba7f2cac7e9aa72aae730292d > -- > 2.39.2 >
diff --git a/init/initramfs.c b/init/initramfs.c index f6c112e30bd4..e7a01c2ccd1b 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -60,15 +60,8 @@ static void __init error(char *x) message = x; } -static void panic_show_mem(const char *fmt, ...) -{ - va_list args; - - show_mem(0, NULL); - va_start(args, fmt); - panic(fmt, args); - va_end(args); -} +#define panic_show_mem(fmt, ...) \ + ({ show_mem(0, NULL); panic(fmt, ##__VA_ARGS__); }) /* link hash */