From patchwork Mon Nov 20 15:11:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 167232 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d903:0:b0:430:37f2:e94a with SMTP id dt3csp2333858vqb; Mon, 20 Nov 2023 07:14:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwlgvKd7MmWdp7SDBO1SupNaVp7K0J0qXT7AntDOZ4lbr80J0dzcTS+aKY5zB00rwru+5m X-Received: by 2002:a17:902:ee95:b0:1cc:3fc9:1802 with SMTP id a21-20020a170902ee9500b001cc3fc91802mr5814251pld.61.1700493298169; Mon, 20 Nov 2023 07:14:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700493298; cv=none; d=google.com; s=arc-20160816; b=JJVJaCXzjcUcUfiNsJx3f7IP1+zumXUv9ndWtt5gz7rDJohs/m6UxzzXaVaytXNkPs LYFVzYmvlloNGb4l4eIAd0Ma5OR7huraeET85KRjiiQghF6rUXZQC+MvGLFtFheltZoD b+m6D2yXiLJxmURQxdTJUMk7gCdNwPR6P4+d5SfASPJSs19gfUfQw99oPN17P/kGajXN bPm8bY3mowYtKVDMPlPSqW/sj1SWJ03ATTxW45CnGcHeJ+OyRUHnYBj+9MeJbrLloY+W w/NlMv7w+JRQ0VoTD8fPvn23hgqSTs1FjGJ8kWGcO/u1TIVWbxCHxHzgvaj1JRXskyZH HvoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ry+9ImvlL9ligd904tVFao1Ka9OIiaqoov88lyP7y/M=; fh=3VDKuUpnZHU/E7Q667FFh57Tg9oMevOil/UrLftGKk8=; b=lGqDkM2yl88uUxgYCv8HYAJs0T7VRghFZDhupwipsQDL3GcWKC27PApQySZHMxGkMN OM3Bx2liDRGjJ3Q5AX3EclbZT4GcI3g+xEBL6rMdTM/wrEBbJ8bbk13Z8H25iQnM5u8I nd/XTGebafW91wKB6fiFm1DFyAQ/LGdj2dv0r/MtK5JkE+NsOf5r5M0hZZJ/PJCe+YwM G2aP0rrGGgHu0hZZz20uiPyGY0haYWzxby1hnEZplDN1QopvKNS2bq8Ef8emX08dlQ/h wS5Ws6sommEEfjE/hoUCTKfFeD1w7BxMbeGuUIzM2CvqpqLk6hplS5gNohtPUZ9eZDnR t1ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AYSMExc+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id s7-20020a170902ea0700b001ce64a096dfsi7150582plg.502.2023.11.20.07.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:14:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AYSMExc+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id CA609806B07B; Mon, 20 Nov 2023 07:14:48 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234346AbjKTPOb (ORCPT + 27 others); Mon, 20 Nov 2023 10:14:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233857AbjKTPO2 (ORCPT ); Mon, 20 Nov 2023 10:14:28 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AEB4D8; Mon, 20 Nov 2023 07:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700493265; x=1732029265; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y1Slo391/qaxM0yM/Z69wR+ZO7w0aji/XOiyHktSsMY=; b=AYSMExc+rUGK0fyrmNWOm5eSUslfzy1/7sA45yHesCNF7cQUlBJUTH4E WU3SddVqZuXtca7s9/ZMiL34+Vd2oqJaRWOX5OKn0ZoP7ulI4yBbx8gyf EhkGSlU7EQsbjoDgD05WAVaUG19GGJ/jkjRfVdt0B4GLMs+4LFhmCz6ZN gXgYlMsyCUSFiXbqrkNYuRCc1Rsdd6hMPfDauu9KoPm7q4JXjKlBdhrf7 l4MK39bySJCHXKY5LIV5qpyMCOWIgwRobRBEG7fR7HDDniuV1+l3KWfZJ /vPEd7taZDsUnk35sB2I3yiQQGYIN6E5sVp8fH3YauxgEzffexe/CaooL g==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="394486342" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="394486342" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 07:14:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="801209700" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="801209700" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 20 Nov 2023 07:14:22 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 490A168; Mon, 20 Nov 2023 17:14:21 +0200 (EET) From: Andy Shevchenko To: Luis Chamberlain , Kees Cook , Andy Shevchenko , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 1/5] params: Introduce the param_unknown_fn type Date: Mon, 20 Nov 2023 17:11:42 +0200 Message-ID: <20231120151419.1661807-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> References: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 20 Nov 2023 07:14:48 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783096460349093524 X-GMAIL-MSGID: 1783096460349093524 Introduce a new type for the callback to parse an unknown argument. This unifies function prototypes which takes that as a parameter. Reviewed-by: Luis Chamberlain Reviewed-by: Kees Cook Signed-off-by: Andy Shevchenko --- include/linux/moduleparam.h | 6 +++--- kernel/params.c | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 4fa9726bc328..bfb85fd13e1f 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -385,6 +385,8 @@ extern bool parameq(const char *name1, const char *name2); */ extern bool parameqn(const char *name1, const char *name2, size_t n); +typedef int (*parse_unknown_fn)(char *param, char *val, const char *doing, void *arg); + /* Called on module insert or kernel boot */ extern char *parse_args(const char *name, char *args, @@ -392,9 +394,7 @@ extern char *parse_args(const char *name, unsigned num, s16 level_min, s16 level_max, - void *arg, - int (*unknown)(char *param, char *val, - const char *doing, void *arg)); + void *arg, parse_unknown_fn unknown); /* Called by module remove. */ #ifdef CONFIG_SYSFS diff --git a/kernel/params.c b/kernel/params.c index 2d4a0564697e..626fa8265932 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -120,9 +120,7 @@ static int parse_one(char *param, unsigned num_params, s16 min_level, s16 max_level, - void *arg, - int (*handle_unknown)(char *param, char *val, - const char *doing, void *arg)) + void *arg, parse_unknown_fn handle_unknown) { unsigned int i; int err; @@ -165,9 +163,7 @@ char *parse_args(const char *doing, unsigned num, s16 min_level, s16 max_level, - void *arg, - int (*unknown)(char *param, char *val, - const char *doing, void *arg)) + void *arg, parse_unknown_fn unknown) { char *param, *val, *err = NULL; From patchwork Mon Nov 20 15:11:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 167235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d903:0:b0:430:37f2:e94a with SMTP id dt3csp2335187vqb; Mon, 20 Nov 2023 07:16:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHZ9M14pFOohkOkmX5lIwxN6mPsXIeaUnehGIhn5trPSPgh0kJdCXiHVj990mMV1iqwtFdR X-Received: by 2002:a05:6870:d29a:b0:1c5:56f:ac08 with SMTP id d26-20020a056870d29a00b001c5056fac08mr9933771oae.12.1700493375048; Mon, 20 Nov 2023 07:16:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700493375; cv=none; d=google.com; s=arc-20160816; b=sw/A0POZvgr159V5R6HXy9EiwunEqb5AWzvE74D0QVVqDN0F8e3LM8FxbZtgsNMlPv Kq8S2Y8yxpijejPvNgRYxO7RrAqZQ+kxtsL/iwG3U6a/spfaThGC3wmKnwwR82ZKL3Nf xgtUldAHnxVs49p/fJMFlKJyptzM8A/OzVnda7RZJpVzVZxdkbXFOw1SW4MNc7tytUom f5oVYIE/MdA+dZARXIrTDqfqlqU1yCgM5VBDuxGA3GdVkiCINdtvXb4CohptATmVHnxr lnECOyV0KWzlvX3dJ4cTMkI005Xn2ba50jWf4WA6ovMWKIKKP1d/lDZ0a5ur/Q9If1NG IPng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NA1DF52jkN6HhauZIqD9njrAvLu3yAqZqc3Kwiz6Xl0=; fh=3VDKuUpnZHU/E7Q667FFh57Tg9oMevOil/UrLftGKk8=; b=ZgJf4vC87F+eMR2QW1OvqE+EFT9y0UxahQ+c8PJjOprBEDOqQ8Zh7qbLhZ8eb7V9Pe Ig281eAY68D+/JO+QiNO8F1nJC5YvmaPRPZReNlAcbzbgd3XiXHp9/QF24YNw2I0WAX1 +JNck/QAVGDbXd59im3noHhgQ7xIJtn5EZjOBXCynKJDCE7YURHhn5OkdmkxJf+sQtuc NSGuf/YKhZrbtibGNH16Jayx2iEUl9Mj2fJfjiuEji0IDppprte3xzBcGdlq5wGfZpxe tfW2awl2SV/z9VO81u8YuO4R1uBsyIRHvFkSFULwM1BMJGmmfeCGjJbdTB548R+7Z8fh CGlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AGmk7sbN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id e9-20020a056870c0c900b001f95c05d46dsi131012oad.128.2023.11.20.07.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:16:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AGmk7sbN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 58EED80784FD; Mon, 20 Nov 2023 07:15:15 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234419AbjKTPOh (ORCPT + 27 others); Mon, 20 Nov 2023 10:14:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234242AbjKTPO3 (ORCPT ); Mon, 20 Nov 2023 10:14:29 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 547C7CB; Mon, 20 Nov 2023 07:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700493266; x=1732029266; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=22qKIvbrgULxlxyf3xmSTybLyjjW9aZHEYq6pWfjelQ=; b=AGmk7sbNCl0eKA72nse3rxU4lhYhOHzM38LOICvGzy98xo1JPBNoscua 7z2qjMB6W/DWRZZqBvH93TXkn3QBMtRPt3ZyaVvCEFF5RgbAaCmcvILb6 plmZkTK9OyOdJzmZvHdASBryKcS1YuwfwhtRQXwnvwF96nKpeDRziPLCP viaIqX4PmGTy+2htEGAgoIc8hvr1cmjTm34Oeeo6D+a5lEZWAFKJEHmzE 3z5zX5Vw110J+u3vkp+FqJ0xZVt3Jam6ye5vCo/1KVESy2grt49gzpZUL Qbx2XCTITmxtNZPrwCwOcWdD2OsNBkkRcfSopi+BoolcHnG+hDHjdmT5A Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="394486347" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="394486347" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 07:14:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="801209698" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="801209698" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 20 Nov 2023 07:14:22 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 5240C9F; Mon, 20 Nov 2023 17:14:21 +0200 (EET) From: Andy Shevchenko To: Luis Chamberlain , Kees Cook , Andy Shevchenko , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 2/5] params: Do not go over the limit when getting the string length Date: Mon, 20 Nov 2023 17:11:43 +0200 Message-ID: <20231120151419.1661807-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> References: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 20 Nov 2023 07:15:15 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783096541384515667 X-GMAIL-MSGID: 1783096541384515667 We can use strnlen() even on early stages and it prevents from going over the string boundaries in case it's already too long. Reviewed-by: Luis Chamberlain Reviewed-by: Kees Cook Signed-off-by: Andy Shevchenko --- kernel/params.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/params.c b/kernel/params.c index 626fa8265932..f8e3c4139854 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -260,7 +260,10 @@ EXPORT_SYMBOL_GPL(param_set_uint_minmax); int param_set_charp(const char *val, const struct kernel_param *kp) { - if (strlen(val) > 1024) { + size_t len, maxlen = 1024; + + len = strnlen(val, maxlen + 1); + if (len == maxlen + 1) { pr_err("%s: string parameter too long\n", kp->name); return -ENOSPC; } @@ -270,7 +273,7 @@ int param_set_charp(const char *val, const struct kernel_param *kp) /* This is a hack. We can't kmalloc in early boot, and we * don't need to; this mangled commandline is preserved. */ if (slab_is_available()) { - *(char **)kp->arg = kmalloc_parameter(strlen(val)+1); + *(char **)kp->arg = kmalloc_parameter(len + 1); if (!*(char **)kp->arg) return -ENOMEM; strcpy(*(char **)kp->arg, val); @@ -508,7 +511,7 @@ int param_set_copystring(const char *val, const struct kernel_param *kp) { const struct kparam_string *kps = kp->str; - if (strlen(val)+1 > kps->maxlen) { + if (strnlen(val, kps->maxlen) == kps->maxlen) { pr_err("%s: string doesn't fit in %u chars.\n", kp->name, kps->maxlen-1); return -ENOSPC; From patchwork Mon Nov 20 15:11:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 167234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d903:0:b0:430:37f2:e94a with SMTP id dt3csp2334562vqb; Mon, 20 Nov 2023 07:15:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IF8UhZ+W9bM+u4AYI8sQNmuWo+vA6dzVXRM3CARL+eyQPrwv50R89zUyv0NUG9nCZcXX9BO X-Received: by 2002:a17:903:41d2:b0:1cc:3544:ea41 with SMTP id u18-20020a17090341d200b001cc3544ea41mr10637042ple.46.1700493337596; Mon, 20 Nov 2023 07:15:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700493337; cv=none; d=google.com; s=arc-20160816; b=XID/Ad86WWM5j5+Hy+Qq153FItZYwWd5UMZiz2Ij7uJtU/mZqzPWXs6B74c2otE9TJ U85NcFCScgNhOJkGSgbg8JqwLcMA2CZKScmkD+jpZKumh1cO+5Pr1yJy0VUyONHOXs3Y wTrq9gcNUEisI0ic9hvnZ3ihnU58MjhXYZ3Kj+Phj5eAJeKHIbzKMg2zCJGZAv1U/xYF rE6fg75rcgb3+5OpYbOax9pMd65wGd/7csONpV+yEReIdqjo+ee0/liEtPKGrXye4FKh V1bFoAQLZvWEgWoGmKZlsUWwhUHN0zp4kBYCQ4KYj7mWcPhQk3IzXKGazz0Ti14eovPe 07HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=81zymCTZI14gqo/LjE3x48M7iRkLOUro4olG/Ylk3vc=; fh=3VDKuUpnZHU/E7Q667FFh57Tg9oMevOil/UrLftGKk8=; b=vYspsb7VRBCpg8trI0dVXpGh80TwV9wCIUBLpLSPIF7a0enOa4DGDp07oYsvkavcCO PevddCU5TlEz5/NKxUv4/Ly41OnrXQPwVnoxGvhj10zWnIimkh9ousNNCqFTelREMNsj qDTWgpmOi8Wlnqx9CWu1wd9Oe5da0YaXcCnQoUAq2XlthDWeti66J5XAWFFH75cxzUZR c0HgdTHIWenQIg3gICNKVqaRRl4kpzBryhK5Uu4Ff99hPFVug1rmQIfvlDiZU6E6jzbv AXp73EQEhIOXCvL4CS4CGLnvgQewZh2mhG+YUILwPjExPkQTrZ65SwcFAcV8YF7Aiyka Wgug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kcKTvZvw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id w19-20020a170902d3d300b001b674055d72si7938991plb.621.2023.11.20.07.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:15:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kcKTvZvw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 2AE638051B38; Mon, 20 Nov 2023 07:15:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234402AbjKTPOd (ORCPT + 27 others); Mon, 20 Nov 2023 10:14:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234151AbjKTPO3 (ORCPT ); Mon, 20 Nov 2023 10:14:29 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7B3FA4; Mon, 20 Nov 2023 07:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700493265; x=1732029265; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D5Ir1Vj8OLtklsn72GYygYA1+G2UYfWZWZVSidHq6PI=; b=kcKTvZvwVGtGylf8gdQDbV6eMPUKloNWG8khdyNa0a2vCPMKl/VR/fcJ weRdhwkgBnA/hhMzWTwx4D6sIOHvf/avkufbI3LXmF+q45/r/Te0pf5Wr ha61WZfBYjpkrEwVA6OVuZLKR6RKmGBaWXjx9nURxwQQzF7llUPiF3+j3 AvMfVPLFBlMnGVa9+a1BfC1bB/SLCUnLLusBxGngAratzb4ivnWBJvcR9 72cu+s/+dLZd1AImLm6I1OP0MA+6FX8hi2TvUWESXZhEV/iHMn/POWOSD 8U4pXSToIu5teX6CpdGlaYFjxADvuN3FxptSvtq5RXhIifBzknypmqDuk g==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="422730970" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="422730970" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 07:14:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="1097766557" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="1097766557" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 20 Nov 2023 07:14:22 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 6093C12A; Mon, 20 Nov 2023 17:14:21 +0200 (EET) From: Andy Shevchenko To: Luis Chamberlain , Kees Cook , Andy Shevchenko , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 3/5] params: Use size_add() for kmalloc() Date: Mon, 20 Nov 2023 17:11:44 +0200 Message-ID: <20231120151419.1661807-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> References: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 20 Nov 2023 07:15:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783096501515088876 X-GMAIL-MSGID: 1783096501515088876 Prevent allocations from integer overflow by using size_add(). Reviewed-by: Luis Chamberlain Reviewed-by: Kees Cook Signed-off-by: Andy Shevchenko --- kernel/params.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/params.c b/kernel/params.c index f8e3c4139854..c3a029fe183d 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -48,7 +49,7 @@ static void *kmalloc_parameter(unsigned int size) { struct kmalloced_param *p; - p = kmalloc(sizeof(*p) + size, GFP_KERNEL); + p = kmalloc(size_add(sizeof(*p), size), GFP_KERNEL); if (!p) return NULL; From patchwork Mon Nov 20 15:11:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 167233 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d903:0:b0:430:37f2:e94a with SMTP id dt3csp2334021vqb; Mon, 20 Nov 2023 07:15:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFypFkB+kBOqjgq9zVzYcmyyWx8ZeW6qPx4zY8c24W6vZ20U910q8yxwbtTsmZ43m5JBCLD X-Received: by 2002:a17:902:d50b:b0:1cf:66a3:16c with SMTP id b11-20020a170902d50b00b001cf66a3016cmr1563138plg.21.1700493306517; Mon, 20 Nov 2023 07:15:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700493306; cv=none; d=google.com; s=arc-20160816; b=V369mpt+FKCgI3IbNbJt5j1aYTI4Zval54Tw+04vwNsA5vt+DB8qaUCTFTK2RhTOON nq9Qq3G1JtzF2f8xYSFu2S9Hit3Nx5IGChTM61HIAE/ZUxnIIZgzCvG3OiYh8+HnuMY6 d33/ESYNtiJF7X57cQg0O3/xCcxEzCHq7tdq030Z++TsdsWYqjTwWLXetO5WsTLTFYFr gxS6kq7I7ZOJbVAZ08ns05LOfyb9GhB//ds9TScUoTGliThO/GN3/QIX4YcHK/FDG0ri 3AJn5AuJuIfoeKaQWJSHD65C6P55z83g0+iA4IgV1uxR7V9kwwSD4b4bMiDNk4OisKGc 6UZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qW3byl46oeGhsvCiWJDotc73+DFh14WWkbVU6PVRYYw=; fh=3VDKuUpnZHU/E7Q667FFh57Tg9oMevOil/UrLftGKk8=; b=jKSPLRRQ8GaV4Vv+ncoYW1+0eHq/eYZvM5Mcn5XZ1K0Y4n4XAJZ1yWp2HzAY4S3tAZ puUNFX7+3GLZ99I/mWuD82J30LUnGfWX8MS/tcn9rgEdOf/wvKAVovma9wksq4V5Tuxs /1dzOWCD3VaHOYdcsTfL1mUSUR1EdfJTAf0BYmhDd744TNLx+x+G1a6/g1yEKzWKooBD 0DnkbxNMbc9mMu2oy9U0OzTeRMBBr4msdBuJaP1PZQc0Aj3eaDBwUGvECFh60sc012D7 3/7I5PzE86D6inn+IFSEr/mpLoeyEf9636I5xPV9n5pjJaekIIs0lQPp+v4X6ZApJgLP 7a9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j+lQmsP0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id t7-20020a170902bc4700b001c76b4c349esi8009771plz.218.2023.11.20.07.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:15:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=j+lQmsP0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id C4EB080401D0; Mon, 20 Nov 2023 07:15:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234411AbjKTPOf (ORCPT + 27 others); Mon, 20 Nov 2023 10:14:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234147AbjKTPO3 (ORCPT ); Mon, 20 Nov 2023 10:14:29 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB24DC8; Mon, 20 Nov 2023 07:14:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700493265; x=1732029265; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=egBySuvnF1rs3mSn+o1fYvDyEOWxN6cCjTLiLa9cCxU=; b=j+lQmsP0OFnU3mXi9p//7Mpo/mOBDSWqI0bI53+keG7c4PzFpGPcqNF2 BtxOdQ6AGwNUc2A8Yj/wPGRqpDKVdnwLMw8is5ZUfpNyb3p6hZp4UFcOS 5s6kk9C9kqpJRtsfVeEYMPNsaguogESD0OMBNlR3EiI87V928CctZJlk/ sM8h87IplghpF4twTOTNR6qpXuuZh6IpL4qrjxBPECnZM7EbXctKmv5IQ g6wL5gfPGuFuMNV+502iBKFyr8TE1TxNxYpQsgN7fVdJj2vnF06LOjcHk EHbuAYUT8NkHNZ3SUZV3pw1qATMDxth7BYrQ9KOV6BnhCs8+R7bkiFNdw A==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="422730966" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="422730966" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 07:14:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="1097766556" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="1097766556" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 20 Nov 2023 07:14:22 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 69CAD118; Mon, 20 Nov 2023 17:14:21 +0200 (EET) From: Andy Shevchenko To: Luis Chamberlain , Kees Cook , Andy Shevchenko , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 4/5] params: Sort headers Date: Mon, 20 Nov 2023 17:11:45 +0200 Message-ID: <20231120151419.1661807-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> References: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 20 Nov 2023 07:15:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783096469480488474 X-GMAIL-MSGID: 1783096469480488474 Sort the headers in alphabetic order in order to ease the maintenance for this part. Reviewed-by: Luis Chamberlain Reviewed-by: Kees Cook Signed-off-by: Andy Shevchenko --- kernel/params.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/params.c b/kernel/params.c index c3a029fe183d..eb55b32399b4 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -3,18 +3,18 @@ Copyright (C) 2001 Rusty Russell. */ -#include -#include -#include -#include -#include -#include +#include #include #include +#include +#include +#include +#include +#include #include -#include -#include #include +#include +#include #ifdef CONFIG_SYSFS /* Protects all built-in parameters, modules use their own param_lock */ From patchwork Mon Nov 20 15:11:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 167236 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d903:0:b0:430:37f2:e94a with SMTP id dt3csp2335236vqb; Mon, 20 Nov 2023 07:16:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiOGft+y5bw5dbvCrd8GIF1akACbuBtotv1hQM97tvRFuVFzT9fkDG56ju82tYl6O3+Z9p X-Received: by 2002:a9d:6f8d:0:b0:6c8:fa40:dbcb with SMTP id h13-20020a9d6f8d000000b006c8fa40dbcbmr7202981otq.6.1700493377561; Mon, 20 Nov 2023 07:16:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700493377; cv=none; d=google.com; s=arc-20160816; b=oTCIsDx9PuGePfABwYm25heaLcTUuwOCHn0J7+rCFE+uRjN1/PknHRUlQL5bH1TTFM U+Rwsd5bpulj7XuxVoQbI/V3+gdyxN+9rTJcXs8xbNIcb7QsdDoggLYt1HjPTiahz2tn SaSsE89hhPycd3EWhr4b5UB74ZC8P7xzjLvvMZlZsmZnIjnaUSD5aBxFUSvtIcNGaAQq rzNXOxCD7TP+RL0tLLz9+lW5ow+z+kJY1wWuypP+Lf7Li9lk+Sd97hJL+oIPYmFOp5Mv DnoI2krrF5GnGsZH9i51NG6/bp4xoWwdR70eZy1VBg2VsqSJjQPbM2sscjWjLrz+WIUj HTRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1YABLEnbD4GEWtzhj8FrYJ43ZVwTwESrZremT3pMgyw=; fh=3VDKuUpnZHU/E7Q667FFh57Tg9oMevOil/UrLftGKk8=; b=OFUqRjdcmrsFnI8Og8pqS314AVajdHyXbV40Y3nyNwbPEtOprRILZ6OUg1+KRvLneR IqqxFc8pV+P9c+9ZQY2AlSZd9uvC3x4Xu1O76IG85KvQtqihrq+AmikiEBsLEOLLlPGO rrotRAVUxtYGFqS9hse8ZgvNuiiDEe7Xju97V/1y3pa8OPZAOgSNbiHobM/Z5WxVNmpg uHV1PWIAA5Yo1pMHUgLOIHSdGXPNK0FpbAS+TOja1z9DIKIC54WLiWoCAtwEWQSLvXRE SNM3SNfneIE1yQnUced+0Ft5ACS1RYsSqEvIvoub81k1JIplOXqu8v5pjNqcA2PwVzX7 NKxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TTXH5gfB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id 184-20020a4a1ac1000000b0057bed3bad1fsi2891326oof.35.2023.11.20.07.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 07:16:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TTXH5gfB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id D1DBB8080002; Mon, 20 Nov 2023 07:15:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234356AbjKTPOk (ORCPT + 27 others); Mon, 20 Nov 2023 10:14:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234244AbjKTPOb (ORCPT ); Mon, 20 Nov 2023 10:14:31 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08C30CF; Mon, 20 Nov 2023 07:14:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700493268; x=1732029268; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y9bZb8ktHeC1feBWDiNoTxs7R/QFBZGG8vwsdkn9s4k=; b=TTXH5gfBU6HN76cK/JdeYleIU6HF77yBnCevWYcQH+U9c0NkNbj97UVQ MOsI7luJL0V8M/sxx/tukwtu6/JfMsgKZALe4gyyFPfvwyygRe20hFA1+ 1nzNygcosW5IxZ+1G7vd9NJsS/A2YQO4MbNaGeo3vTgQxRA/BiSoYh36C xRANSxQjeJZ1i3bnBWrgkgPDf3585qFIE5WOSvXUtUnz8TWxnKB1D474G oAT9XHMh+9mKsf7EJP06z6K2CGkZFT8T5WYN7w9ly9r0bsuesPVv25b9V nd4FSn/AYIez2tWW/InnQFX7PJoiKhKSvRWgvGZ7+N7GbNoGTQ/WzNen6 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="394486350" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="394486350" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 07:14:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10900"; a="801209746" X-IronPort-AV: E=Sophos;i="6.04,214,1695711600"; d="scan'208";a="801209746" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 20 Nov 2023 07:14:25 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7E2491D9; Mon, 20 Nov 2023 17:14:21 +0200 (EET) From: Andy Shevchenko To: Luis Chamberlain , Kees Cook , Andy Shevchenko , linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman Subject: [PATCH v3 5/5] params: Fix multi-line comment style Date: Mon, 20 Nov 2023 17:11:46 +0200 Message-ID: <20231120151419.1661807-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> References: <20231120151419.1661807-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 20 Nov 2023 07:15:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783096544370399317 X-GMAIL-MSGID: 1783096544370399317 The multi-line comment style in the file is rather arbitrary. Make it follow the standard one. Reviewed-by: Luis Chamberlain Reviewed-by: Kees Cook Signed-off-by: Andy Shevchenko --- kernel/params.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/kernel/params.c b/kernel/params.c index eb55b32399b4..2e447f8ae183 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later -/* Helpers for initial module or kernel cmdline parsing - Copyright (C) 2001 Rusty Russell. - -*/ +/* + * Helpers for initial module or kernel cmdline parsing + * Copyright (C) 2001 Rusty Russell. + */ #include #include #include @@ -271,8 +271,10 @@ int param_set_charp(const char *val, const struct kernel_param *kp) maybe_kfree_parameter(*(char **)kp->arg); - /* This is a hack. We can't kmalloc in early boot, and we - * don't need to; this mangled commandline is preserved. */ + /* + * This is a hack. We can't kmalloc() in early boot, and we + * don't need to; this mangled commandline is preserved. + */ if (slab_is_available()) { *(char **)kp->arg = kmalloc_parameter(len + 1); if (!*(char **)kp->arg) @@ -743,8 +745,10 @@ void module_param_sysfs_remove(struct module *mod) { if (mod->mkobj.mp) { sysfs_remove_group(&mod->mkobj.kobj, &mod->mkobj.mp->grp); - /* We are positive that no one is using any param - * attrs at this point. Deallocate immediately. */ + /* + * We are positive that no one is using any param + * attrs at this point. Deallocate immediately. + */ free_module_param_attrs(&mod->mkobj); } }