Message ID | 1547646261-32535-18-git-send-email-rppt@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF03113BF for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 16 Jan 2019 13:46:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC9FB286BF for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 16 Jan 2019 13:46:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFF2C2BBD4; Wed, 16 Jan 2019 13:46:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 454E1286BF for <patchwork-linux-mm@patchwork.kernel.org>; Wed, 16 Jan 2019 13:46:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D777A8E0009; Wed, 16 Jan 2019 08:46:06 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D27C58E0002; Wed, 16 Jan 2019 08:46:06 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BEEDF8E0009; Wed, 16 Jan 2019 08:46:06 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 793738E0002 for <linux-mm@kvack.org>; Wed, 16 Jan 2019 08:46:06 -0500 (EST) Received: by mail-pl1-f197.google.com with SMTP id y2so3840319plr.8 for <linux-mm@kvack.org>; Wed, 16 Jan 2019 05:46:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=S9DAIifYqejEu33cu4ATs8xjrjQEIJ2H60Bn563dC40=; b=EAIQ566qH+Cv/8hSn0UBDa3yEkyQqNImJgArMLVJZKFFgobaCaBKFVdVIR2i6f5UwO BBSWBQqUhVaOAT01RuhgSdVMIaQ+VcebbfNArdHIUiMPfFJU+2pYXAvvSnxjypweY9Sm zS525IXzH70jBdFJUwATveDoYwns6fwP0o5KfTgseeBnjZf9WpxmCdFyKtWTJPlGDOSi /HMm+NXNZ0hAUcXf8ccRGl25mQWBLl/xcjsjEvOdj1l8F//c6n6CBUcfXpnUv6QnLRNb JB7uAobGlWlCy87tFs9CqhH6AEHE5aJk9F6YXdJxxzo23jIdX1pJhTnCBJJ1WtrWsv3r Z9Yw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AJcUukfhWKWlhJe9pZU8sLYMHNAUvIKK3/KfYHikFenyzOUoiTZFMQAT BE9NgAnc9PqsWezVGPI3HamEy/DMo+NSE3+smntIF08NKHNKSNTz/YMT/y8xwKQWjRt2l/tg03E kK7FsoUuw8xU8dP4EQDDcLzRxZatV9oGeymr96HS7A9mUfWjrl/72HhpTaMZMc5welQ== X-Received: by 2002:a63:658:: with SMTP id 85mr8888401pgg.373.1547646366132; Wed, 16 Jan 2019 05:46:06 -0800 (PST) X-Google-Smtp-Source: ALg8bN4Brw33ZBXCsMcDQHhUXWuwgqCSd3B8rUOz+2ikFzMpX+zfRrQLMT0DlMlaakYh6WTXiwkY X-Received: by 2002:a63:658:: with SMTP id 85mr8888355pgg.373.1547646365422; Wed, 16 Jan 2019 05:46:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547646365; cv=none; d=google.com; s=arc-20160816; b=KY6EZs0y8T87EnD4Ud5xAJlEQc3WWoUmI9sqXaM588IvsB4NA08ozkhGQsQ+qNANLA zokmoBMxs1VpcXK2cMqh6+6g39qD0139FcwkdfSilotyEx4ID/0gYfhx/pChLCPCf/KP y727GjvB8JVJww1XuPCJU8qwIeg1FsPJuO9xBztIpBF7SB6eGUT+vOyhcuUJx5dBFiMW BFDSRbyUWUpbo5ieok2uQ9UkLr8hH52gWrM5H3ECMClW8qqLoiuBFJRql8gI12YnDSzX VJFRewXKOWLAn4uatByRselrrqCExmF9sDsSVg9xmt6WuW7OHyRdO6jWTrFqbF0f5Fo7 JEcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from; bh=S9DAIifYqejEu33cu4ATs8xjrjQEIJ2H60Bn563dC40=; b=J7Sy4WZfxTWsGvHoM2AfZbjM4lutDUGkfOp7hHc9mhJXgotrUG3YIKXWZ8MlKCTm08 HYR+GmalyAmCtXkdipw6cNCOCgo7BUszb6lzL5SMYR9zgRLsyHRz/NQbw9JIiZvSrfVi zQ6uGRl1eMCz181+M/LzXtmopi0RATbXWIN6KQgnJ6e+SFgjyWCTjJHy+KaNHq8qajjQ gAaELFz74cE1OqNRnNIUbCpaSsunPuxPO+LkJ7OkC2XLtSNGp35+J75gZ/d/pjWaBOnS 1kdyxn3uQGjG9H5cZjxVfnRxoJ+LjnXzKWscsdKiiDXkkNf1BoiqjDrDpVAlOAJ35hAl z2Ww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id q32si6030487pgm.410.2019.01.16.05.46.05 for <linux-mm@kvack.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 05:46:05 -0800 (PST) Received-SPF: pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id x0GDedqv031587 for <linux-mm@kvack.org>; Wed, 16 Jan 2019 08:46:04 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2q25eu0xct-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for <linux-mm@kvack.org>; Wed, 16 Jan 2019 08:46:04 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <linux-mm@kvack.org> from <rppt@linux.ibm.com>; Wed, 16 Jan 2019 13:46:01 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Wed, 16 Jan 2019 13:45:50 -0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x0GDjnsK66256932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 16 Jan 2019 13:45:49 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 727C0A405F; Wed, 16 Jan 2019 13:45:49 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 58723A4054; Wed, 16 Jan 2019 13:45:45 +0000 (GMT) Received: from rapoport-lnx (unknown [9.148.8.226]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 16 Jan 2019 13:45:45 +0000 (GMT) Received: by rapoport-lnx (sSMTP sendmail emulation); Wed, 16 Jan 2019 15:45:44 +0200 From: Mike Rapoport <rppt@linux.ibm.com> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, Catalin Marinas <catalin.marinas@arm.com>, Christoph Hellwig <hch@lst.de>, "David S. Miller" <davem@davemloft.net>, Dennis Zhou <dennis@kernel.org>, Geert Uytterhoeven <geert@linux-m68k.org>, Greentime Hu <green.hu@gmail.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Guan Xuetao <gxt@pku.edu.cn>, Guo Ren <guoren@kernel.org>, Heiko Carstens <heiko.carstens@de.ibm.com>, Mark Salter <msalter@redhat.com>, Matt Turner <mattst88@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>, Michael Ellerman <mpe@ellerman.id.au>, Michal Simek <monstr@monstr.eu>, Paul Burton <paul.burton@mips.com>, Petr Mladek <pmladek@suse.com>, Rich Felker <dalias@libc.org>, Richard Weinberger <richard@nod.at>, Rob Herring <robh+dt@kernel.org>, Russell King <linux@armlinux.org.uk>, Stafford Horne <shorne@gmail.com>, Tony Luck <tony.luck@intel.com>, Vineet Gupta <vgupta@synopsys.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, devicetree@vger.kernel.org, kasan-dev@googlegroups.com, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, linux-usb@vger.kernel.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, x86@kernel.org, xen-devel@lists.xenproject.org, Mike Rapoport <rppt@linux.ibm.com> Subject: [PATCH 17/21] init/main: add checks for the return value of memblock_alloc*() Date: Wed, 16 Jan 2019 15:44:17 +0200 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547646261-32535-1-git-send-email-rppt@linux.ibm.com> References: <1547646261-32535-1-git-send-email-rppt@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19011613-0028-0000-0000-00000339FC69 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19011613-0029-0000-0000-000023F7237C Message-Id: <1547646261-32535-18-git-send-email-rppt@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-16_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901160114 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Refine memblock API
|
expand
|
diff --git a/init/main.c b/init/main.c index a56f65a..d58a365 100644 --- a/init/main.c +++ b/init/main.c @@ -373,12 +373,20 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { } */ static void __init setup_command_line(char *command_line) { - saved_command_line = - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES); - initcall_command_line = - memblock_alloc(strlen(boot_command_line) + 1, SMP_CACHE_BYTES); - static_command_line = memblock_alloc(strlen(command_line) + 1, - SMP_CACHE_BYTES); + size_t len = strlen(boot_command_line) + 1; + + saved_command_line = memblock_alloc(len, SMP_CACHE_BYTES); + if (!saved_command_line) + panic("%s: Failed to allocate %zu bytes\n", __func__, len); + + initcall_command_line = memblock_alloc(len, SMP_CACHE_BYTES); + if (!initcall_command_line) + panic("%s: Failed to allocate %zu bytes\n", __func__, len); + + static_command_line = memblock_alloc(len, SMP_CACHE_BYTES); + if (!static_command_line) + panic("%s: Failed to allocate %zu bytes\n", __func__, len); + strcpy(saved_command_line, boot_command_line); strcpy(static_command_line, command_line); } @@ -773,8 +781,14 @@ static int __init initcall_blacklist(char *str) pr_debug("blacklisting initcall %s\n", str_entry); entry = memblock_alloc(sizeof(*entry), SMP_CACHE_BYTES); + if (!entry) + panic("%s: Failed to allocate %zu bytes\n", + __func__, sizeof(*entry)); entry->buf = memblock_alloc(strlen(str_entry) + 1, SMP_CACHE_BYTES); + if (!entry->buf) + panic("%s: Failed to allocate %zu bytes\n", + __func__, strlen(str_entry) + 1); strcpy(entry->buf, str_entry); list_add(&entry->next, &blacklisted_initcalls); }
Add panic() calls if memblock_alloc() returns NULL. The panic() format duplicates the one used by memblock itself and in order to avoid explosion with long parameters list replace open coded allocation size calculations with a local variable. Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> --- init/main.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)