Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp2977445pxb; Tue, 12 Jan 2021 03:23:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEUm9snCJDbFABdtvhBPbPicrmwsVmfRDA9nRzf3VQpOYPZ+H+907v9hhO4UzyOWmJgHxb X-Received: by 2002:a17:906:c310:: with SMTP id s16mr2896513ejz.186.1610450633522; Tue, 12 Jan 2021 03:23:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610450633; cv=none; d=google.com; s=arc-20160816; b=cNtgf8sMqmRJimFGXXTuYf/ViorC75YvTI93/wnIkGdgLe1LLATHnKKmxc7ptiN3E9 G92KSKrLutkoak+LYnbFMiODq4L+8yAcqUEYfbRLb9xAWuO66mdmJo16dyYMrVO1lAgk 1EYJ03cN+7AGjcu68URQofan4YJEM1gIJ3OmFR2rNwpLWmMUzm3UsNYTqS19x9MB+5sL gMTdDGDxi5wUAqT9/EF7if5n/uK+v/ldXzeQkUct8YwjrRFVKZUAG0s3PGQg51MK7h/F fb79jUccJgC4aU3yBnvpoH7aq2huoi2RZ2IPq4LfkzCB213qXjrZMdlBuukwE4WpiUAL EkEw== 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:subject:cc:to:from:date :dkim-signature; bh=G7cUF0L87SRYhzqUpsfBcWmAe9EAC/P8MEUxe7rHjHU=; b=RGL0KAOYbGUfRuE82aTorbC+N1yznx3wMbGUgydQ77vqWKq/Wm0SNwl9IrKbpmep9I 5K9hLm2jf2lymia3NsdSx/nzY4E/E2saaZMapNyLxFknNQ8f1U+Hv4CwB0+3wVFd4xut AFafKvB1Nvwffa5CTX9qo7dIQ/wfIBpTe6IabxToWNN9w7dXgHQsjpkyqqeD6REvGsFa gzQ/W2qYowh3UIYW2Y8wZypTa0CWYbNvS1njrvi4iBOliBoRUfnjz7zjlCIBKNFaJNXD T/x0ucJq2wiSRq2QwgZafp3j/2LQgOzzdhNLGkmXH/DTzQunQ181ep8aQmAKs4RxBX+V IctQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b=WFj9SeW+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id by23si1051648ejb.165.2021.01.12.03.23.29; Tue, 12 Jan 2021 03:23:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b=WFj9SeW+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733094AbhALG32 (ORCPT + 99 others); Tue, 12 Jan 2021 01:29:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:52646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733070AbhALG31 (ORCPT ); Tue, 12 Jan 2021 01:29:27 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 54790229CA; Tue, 12 Jan 2021 06:28:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1610432926; bh=66Qx1gj4EzTEeVhhLDcGKAc/ygvdzEvNrer5sghrXJ4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=WFj9SeW+PsLybv3ux9riWrJaLAdMXDXKXz7KO+2WGT560uhpeR/6TKnzEuChPHvLc iT6R7pT6h6duplxwdDpwAo0C3uDu9tzJU3HGG0pcHydpL9QMzv9qVv1S6J2HjTUDmr JJMBPFJeJUT078kuTfy6+m+HsDPGx2Jdon+YmDkE= Date: Mon, 11 Jan 2021 22:28:45 -0800 From: Andrew Morton To: Xiaoming Ni Cc: , , , , , , , , , Subject: Re: [PATCH v3] proc_sysctl: fix oops caused by incorrect command parameters. Message-Id: <20210111222845.67ceb4e3c7f64f267756e4e8@linux-foundation.org> In-Reply-To: <89d1369e-f0a8-66f2-c0ea-3aac3a55e2c1@huawei.com> References: <20210112033155.91502-1-nixiaoming@huawei.com> <20210111203340.98dd3c8fa675b709bcf6d49e@linux-foundation.org> <89d1369e-f0a8-66f2-c0ea-3aac3a55e2c1@huawei.com> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 12 Jan 2021 14:24:05 +0800 Xiaoming Ni wrote: > On 2021/1/12 12:33, Andrew Morton wrote: > > On Tue, 12 Jan 2021 11:31:55 +0800 Xiaoming Ni wrote: > > > >> The process_sysctl_arg() does not check whether val is empty before > >> invoking strlen(val). If the command line parameter () is incorrectly > >> configured and val is empty, oops is triggered. > >> > >> --- a/fs/proc/proc_sysctl.c > >> +++ b/fs/proc/proc_sysctl.c > >> @@ -1770,6 +1770,9 @@ static int process_sysctl_arg(char *param, char *val, > >> return 0; > >> } > >> > >> + if (!val) > >> + return -EINVAL; > >> + > > > > I think v2 (return 0) was preferable. Because all the other error-out > > cases in process_sysctl_arg() also do a `return 0'. > > https://lore.kernel.org/lkml/bc098af4-c0cd-212e-d09d-46d617d0acab@huawei.com/ > > patch4: > +++ b/fs/proc/proc_sysctl.c > @@ -1757,6 +1757,9 @@ static int process_sysctl_arg(char *param, > char *val, > loff_t pos = 0; > ssize_t wret; > > + if (!val) > + return 0; > + > if (strncmp(param, "sysctl", sizeof("sysctl") - 1) == 0) { > param += sizeof("sysctl") - 1; > > Is this the version you're talking about? yes, but as a separate patch. The bugfix comes first. > > > > If we're going to do a separate "patch: make process_sysctl_arg() > > return an errno instead of 0" then fine, we can discuss that. But it's > > conceptually a different work from fixing this situation. > > . > > > However, are the logs generated by process_sysctl_arg() clearer and more > accurate than parse_args()? Should the logs generated by > process_sysctl_arg() be deleted? I think the individual logs are very useful and should be retained.