From patchwork Sun Oct 20 22:17:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Savitz X-Patchwork-Id: 11201127 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5087314ED for ; Sun, 20 Oct 2019 22:18:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2763721929 for ; Sun, 20 Oct 2019 22:18:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LGFNscPv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726650AbfJTWRv (ORCPT ); Sun, 20 Oct 2019 18:17:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24307 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726583AbfJTWRv (ORCPT ); Sun, 20 Oct 2019 18:17:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571609870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ToBhWAEeBjIvJkh62QqZLUlNNUmIw5rQlwF9iuvC60U=; b=LGFNscPv9IiXdrQR7Pi2U8qdCa9227JmNw+Rn/pN+bSbj7OK6aivA8XXjhBAU1VxNkCKfE dYIFPoBs6+DdDYJ6VhCi9o7q8pv+lgIXp39AfrpoUCWQ4OftSVojcwR9Fl1wH3pjC0WuMA 1g5lZ7eWuUzrKfeyK7CPuUdRIuv69G8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-96-OsNYrM9cMQuslhkGZX3JcA-1; Sun, 20 Oct 2019 18:17:48 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 444FE80183E; Sun, 20 Oct 2019 22:17:47 +0000 (UTC) Received: from jsavitz.bos.com (ovpn-121-29.rdu2.redhat.com [10.10.121.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 466E760A35; Sun, 20 Oct 2019 22:17:45 +0000 (UTC) From: Joel Savitz To: linux-kernel@vger.kernel.org Cc: Joel Savitz , Fabrizio D'Angelo , Alexey Dobriyan , Andrew Morton , Greg Kroah-Hartman , Thomas Gleixner , linux-fsdevel@vger.kernel.org, fedora-rpi@googlegroups.com Subject: [PATCH] fs: proc: Clarify warnings for invalid proc dir names Date: Sun, 20 Oct 2019 18:17:42 -0400 Message-Id: <20191020221742.5728-1-jsavitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: OsNYrM9cMQuslhkGZX3JcA-1 X-Mimecast-Spam-Score: 0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org When one attempts to create a directory in /proc with an invalid name, such as one in a subdirectory that doesn't exist, one with a name beyond 256 characters, or a reserved name such as '.' or '..', the kernel throws a warning message that looks like this: [ 7913.252558] name 'invalid_name' This warning message is nearly the same for all invalid cases, including the removal of a nonexistent directory. This patch clarifies the warning message and differentiates the invalid creation/removal cases so as to allow the user to more quickly understand their mistake. Signed-off-by: Fabrizio D'Angelo Signed-off-by: Joel Savitz --- fs/proc/generic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 64e9ee1b129e..df04fd4f02af 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -173,7 +173,7 @@ static int __xlate_proc_name(const char *name, struct proc_dir_entry **ret, len = next - cp; de = pde_subdir_find(de, cp, len); if (!de) { - WARN(1, "name '%s'\n", name); + WARN(1, "invalid proc dir name '%s'\n", name); return -ENOENT; } cp += len + 1; @@ -386,15 +386,15 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent, qstr.name = fn; qstr.len = strlen(fn); if (qstr.len == 0 || qstr.len >= 256) { - WARN(1, "name len %u\n", qstr.len); + WARN(1, "invalid proc dir name len %u\n", qstr.len); return NULL; } if (qstr.len == 1 && fn[0] == '.') { - WARN(1, "name '.'\n"); + WARN(1, "invalid proc dir name '.'\n"); return NULL; } if (qstr.len == 2 && fn[0] == '.' && fn[1] == '.') { - WARN(1, "name '..'\n"); + WARN(1, "invalid proc dir name '..'\n"); return NULL; } if (*parent == &proc_root && name_to_int(&qstr) != ~0U) { @@ -402,7 +402,7 @@ static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent, return NULL; } if (is_empty_pde(*parent)) { - WARN(1, "attempt to add to permanently empty directory"); + WARN(1, "attempt to add to permanently empty directory in proc"); return NULL; } @@ -670,7 +670,7 @@ void remove_proc_entry(const char *name, struct proc_dir_entry *parent) rb_erase(&de->subdir_node, &parent->subdir); write_unlock(&proc_subdir_lock); if (!de) { - WARN(1, "name '%s'\n", name); + WARN(1, "unable to remove nonexistent proc dir '%s'\n", name); return; }