From patchwork Tue Jun 4 17:44:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 165809 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp6160646ili; Tue, 4 Jun 2019 10:44:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxtmo4XtgysgA/goKBpEXmNSLuluhzW/1GoDpDDfpKhEWrMTomRJ0m2WjMJ1qF4JvFOyQoV X-Received: by 2002:a17:902:a5ca:: with SMTP id t10mr35550041plq.98.1559670277299; Tue, 04 Jun 2019 10:44:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559670277; cv=none; d=google.com; s=arc-20160816; b=wNBoaRPo1Yz3ErPQbNV8MZt82qAn/+Xygay/3u3+DH4X/2DC8Nrg1GzKVbVLrjaEgF 8bwN6BQp3l0K34oTwJKGyAeJGGmT45QWfDD4m6UKreH1lrD8JGjwezk3NF0rKcJIzwJf Wky0vsVTObJxq344XfRTx3ul8coImFuSLWcScOWGrOppwWQQm/7mRIaFOChFVp7Rx42P UFo+uQ9XKI7JFNYAzaXqcQMeS/ry0Wzig2kE+eMxyDKjZWB4CygwghyQB1JHv3I6WWTv 71JVrPmIwETDtmZ9yYcCop0CFpfl+qTJqho7GzRm39uEyHWf23564G/Pypho3+xkQ1w8 Ic2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=hfYqstATMxMwoXJHu8Wkpjvj39D6WWogH7gu86RCn1I=; b=0wqUkoFXsfx9GRoFZEZdaUKtIDDS7UoKP29sE4hPYo2om+RDiO5FZJXhAsd+wrPRdJ /cszO/F8frQh9SMb2jDfRWD2hyzszDxDahAnqkQNMEVs9DSYdCiPt5N9h9yvnWztoz5x 51Ix0DBh1UoBPb7KFn1B164SOBFR+WesH7kbWgyCpb22jI4jRxHnrntHWNci6kdSFRa3 vAhgxKgpwKx5Uq5Cuf/M/K0G91cXmbjNpYdVfGEo6iO2uAHICXRQ2HPsyquvXjRRj/Lv qutjBGyQ5n/UA4kXPLJ2mrM4ZRD03VMwy14Cih1/ld7s8g0zm2vLPQKv3tHHQbDZszkB CkCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=0RCS61bP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w21si21822294pgh.251.2019.06.04.10.44.36; Tue, 04 Jun 2019 10:44:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=0RCS61bP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726831AbfFDRog (ORCPT + 30 others); Tue, 4 Jun 2019 13:44:36 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:27715 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726460AbfFDRof (ORCPT ); Tue, 4 Jun 2019 13:44:35 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-09.nifty.com with ESMTP id x54HiGwD019946; Wed, 5 Jun 2019 02:44:16 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x54HiGwD019946 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1559670256; bh=hfYqstATMxMwoXJHu8Wkpjvj39D6WWogH7gu86RCn1I=; h=From:To:Cc:Subject:Date:From; b=0RCS61bPD/YYo8BxOT1uO7oS/UEQVBA6xBU23hhs7oqIerqoN5+lMvG9gS42QNDRU Tzr/7eej23xlc3nbmGxQpFhVlPM5vP6+Ep2KPD7Urm6SVsDC5MEAZ/gTXi17nYtXM4 vZMSGLpKZ1GnCYvUEMB/OakehOT4dLVvb73o1OClRKu76zLPYYFJxUrgbRvAM5Sl6/ ECinsXWTx/Sw0xdXz0Ksk+4aYyG0A7WDslL8bbozmSIovF+PkOhnlNAxhn15/BSGqv /pJQwzyf/ipj1B4EWvCaHuQOu5O5KhYiz1D4zws8F53epqiWmiLGYd40BAB1HiFqmI B82PIMDkjnWaA== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , "Rafael J. Wysocki" Subject: [PATCH] kobject: return -ENOSPC when add_uevent_var() fails Date: Wed, 5 Jun 2019 02:44:12 +0900 Message-Id: <20190604174412.13324-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function never attempts to allocate memory, so returning -ENOMEM looks weird to me. The reason of the failure is there is no more space in the given kobj_uevent_env structure. No caller of this function relies on this functing returning a specific error code, so just change it to return -ENOSPC. The intended change, if any, is the error number displayed in log messages. Signed-off-by: Masahiro Yamada --- lib/kobject_uevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 7998affa45d4..5ffd44bf4aad 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -647,7 +647,7 @@ EXPORT_SYMBOL_GPL(kobject_uevent); * @env: environment buffer structure * @format: printf format for the key=value pair * - * Returns 0 if environment variable was added successfully or -ENOMEM + * Returns 0 if environment variable was added successfully or -ENOSPC * if no space was available. */ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) @@ -657,7 +657,7 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) if (env->envp_idx >= ARRAY_SIZE(env->envp)) { WARN(1, KERN_ERR "add_uevent_var: too many keys\n"); - return -ENOMEM; + return -ENOSPC; } va_start(args, format); @@ -668,7 +668,7 @@ int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) if (len >= (sizeof(env->buf) - env->buflen)) { WARN(1, KERN_ERR "add_uevent_var: buffer size too small\n"); - return -ENOMEM; + return -ENOSPC; } env->envp[env->envp_idx++] = &env->buf[env->buflen];