From patchwork Fri Mar 22 11:28:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 229966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0D4B72C00CB for ; Fri, 22 Mar 2013 22:28:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754627Ab3CVL2Z (ORCPT ); Fri, 22 Mar 2013 07:28:25 -0400 Received: from mail-bk0-f54.google.com ([209.85.214.54]:60731 "EHLO mail-bk0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752833Ab3CVL2U (ORCPT ); Fri, 22 Mar 2013 07:28:20 -0400 Received: by mail-bk0-f54.google.com with SMTP id w5so1837735bku.13 for ; Fri, 22 Mar 2013 04:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=KzYXOGZLhS3cBsFmddnjlFO8LbUgjfrtlKt4GWvHnZI=; b=Pd2znuihAI8emn0sTpLzGXuShkqtHODjrj4MDB4V8UYkMnPAOQgxgFDuJI22B2xk3l 6xLAiKXj3v4OQLsetnLd5ioM+rdl3wL0/PjDH5tXuXiNsJ6F2kSRImfpbBy2Yyd9lLCJ BhoS7rYPxyTx1GYZu+ZqOvAGxCUnGLqVXQBMqPsOOI17Os/F9rxjDLW7TlHZvrbo1C8U zAjSrrMwEbBQXbS1BAOK9C3HR96M3w66Fl8wByd76xS/pBMWvyM1CvEw8WZUYS3a8XYY XrkZbdt51Egq0AHzQm9+uojuo2Vo3U3gOYuDTlwaaqhRPZo8frEPyNq7+DA3asMLmxe3 2RBQ== MIME-Version: 1.0 X-Received: by 10.205.116.71 with SMTP id fh7mr739192bkc.7.1363951699051; Fri, 22 Mar 2013 04:28:19 -0700 (PDT) Received: by 10.204.30.210 with HTTP; Fri, 22 Mar 2013 04:28:18 -0700 (PDT) Date: Fri, 22 Mar 2013 19:28:18 +0800 Message-ID: Subject: [PATCH -next] netfilter: nfnetlink_queue: fix error return code in nfnetlink_queue_init() From: Wei Yongjun To: pablo@netfilter.org, kaber@trash.net Cc: yongjun_wei@trendmicro.com.cn, netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, coreteam@netfilter.org Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Wei Yongjun Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun --- net/netfilter/nfnetlink_queue_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index 1cb4854..42680b2 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -1062,8 +1062,10 @@ static int __init nfnetlink_queue_init(void) #ifdef CONFIG_PROC_FS if (!proc_create("nfnetlink_queue", 0440, - proc_net_netfilter, &nfqnl_file_ops)) + proc_net_netfilter, &nfqnl_file_ops)) { + status = -ENOMEM; goto cleanup_subsys; + } #endif register_netdevice_notifier(&nfqnl_dev_notifier);