From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752424AbeFEQpE (ORCPT ); Tue, 5 Jun 2018 12:45:04 -0400 Received: from mx2.suse.de ([195.135.220.15]:46866 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751950AbeFEQns (ORCPT ); Tue, 5 Jun 2018 12:43:48 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Michal Suchanek To: Jonathan Corbet , Michal Suchanek , Arnd Bergmann , Frederic Weisbecker , Ingo Molnar , Aaron Wu , Tony Luck , Andrew Morton , Thomas Gleixner , "Steven Rostedt," , Laura Abbott , Dominik Brodowski , Alexey Dobriyan , Tom Lendacky , Jeffrey Hugo , Baoquan He , Ilya Matveychikov , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v10 3/5] init/main.c: simplify repair_env_string. Date: Tue, 5 Jun 2018 18:43:10 +0200 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Quoting characters are now removed from the parameter so value always follows directly after the NUL terminating parameter name. Signed-off-by: Michal Suchanek --- init/main.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/init/main.c b/init/main.c index 4bc2819d97ad..d0f4a7a0f010 100644 --- a/init/main.c +++ b/init/main.c @@ -251,15 +251,10 @@ static int __init repair_env_string(char *param, char *val, const char *unused, void *arg) { if (val) { - /* param=val or param="val"? */ - if (val == param+strlen(param)+1) - val[-1] = '='; - else if (val == param+strlen(param)+2) { - val[-2] = '='; - memmove(val-1, val, strlen(val)+1); - val--; - } else - BUG(); + int parm_len = strlen(param); + + param[parm_len] = '='; + BUG_ON(val != param + parm_len + 1); } return 0; } -- 2.13.6