From patchwork Sun Nov 12 23:15:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 837293 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="WXDo/O+Z"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZqQQ1zp2z9s7m for ; Mon, 13 Nov 2017 10:16:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751711AbdKLXQL (ORCPT ); Sun, 12 Nov 2017 18:16:11 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:55411 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750943AbdKLXPb (ORCPT ); Sun, 12 Nov 2017 18:15:31 -0500 Received: by mail-wr0-f193.google.com with SMTP id l8so12889142wre.12 for ; Sun, 12 Nov 2017 15:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=52oD2lUcSfG79pV3df3ydWwlzjG6Vl7//pNVbjsnMmA=; b=WXDo/O+ZjK0hhsoRSAAwyck3BXprO2nP+StxUYV7swCZ5reXo+pMtUUH+IBZ963yTq qRYmz09uomdnf4kn8H3rJapcOlKYptucUvUyOU76oYgVcM29pUJxmHlB9di+ehvpBNsZ 7apm2+0WMAaVVBuFsbI0pnGAMoD3TiVphuPeQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=52oD2lUcSfG79pV3df3ydWwlzjG6Vl7//pNVbjsnMmA=; b=eLxEFhGc9QNsA2H6w5w0BbRtehckAurJ2qTcvI5QGJNwBERkr1AwEJ4ciS985hLiKF od/VQ1QuKfU8jGkVIgrfRHz+RsvcLqDJh09IizIooIj0AiJ9Fb6wpTQ3xObjfRZMqqeJ gj/jr7PGRZDo6HRlnxGbB5tSZ1U3geNvgnNbpUTE29mkTGeVk/qQMkqVkZyO6Ek510MP neADWUx29LbIfs8EH7AmAx11+TdcHpmnBY0eYovFieK/bYtqtwvFl//L+vJCwUk0QaXb 2ssQPFq6ZdKQgxFgdCd2TSRk6Aa7yUlu0cEhDd+2dK551/Sbfkqw48O7eegHzyC7VOWo gxnw== X-Gm-Message-State: AJaThX5lUhFx1tqDDBqJpE6jYGGVlLkmtJ+b8swQUnE+gFI8ZzVQABpO 9aVP/95uB0WcZ8/kqAIZbUQSrA== X-Google-Smtp-Source: AGs4zMbDiOlcQzst7pfASIyoJUZtSANemSF/SYpTt44HM37WcC20InZTau49hU99C5VOGjzZPdFQbw== X-Received: by 10.223.160.86 with SMTP id l22mr5519030wrl.187.1510528530706; Sun, 12 Nov 2017 15:15:30 -0800 (PST) Received: from wildmoose.dk ([2a01:488:66:1000:57e6:57d1:0:1]) by smtp.gmail.com with ESMTPSA id o70sm48012169wrb.62.2017.11.12.15.15.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 15:15:30 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] net: core: maybe return -EEXIST in __dev_alloc_name Date: Mon, 13 Nov 2017 00:15:09 +0100 Message-Id: <20171112231511.4666-7-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171112231511.4666-1-linux@rasmusvillemoes.dk> References: <20171112231511.4666-1-linux@rasmusvillemoes.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If we're given format string with no %d, -EEXIST is a saner error code. Signed-off-by: Rasmus Villemoes --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index c0a92cf27566..7c08b4ca7b76 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1104,7 +1104,7 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) * when the name is long and there isn't enough space left * for the digits, or if all bits are used. */ - return -ENFILE; + return p ? -ENFILE : -EEXIST; } static int dev_alloc_name_ns(struct net *net,