From patchwork Wed Nov 25 01:15:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 39257 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id EDD3A1007D1 for ; Wed, 25 Nov 2009 12:16:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934099AbZKYBPi (ORCPT ); Tue, 24 Nov 2009 20:15:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934080AbZKYBPh (ORCPT ); Tue, 24 Nov 2009 20:15:37 -0500 Received: from mail-pz0-f171.google.com ([209.85.222.171]:62619 "EHLO mail-pz0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933891AbZKYBPg (ORCPT ); Tue, 24 Nov 2009 20:15:36 -0500 Received: by pzk1 with SMTP id 1so5220563pzk.33 for ; Tue, 24 Nov 2009 17:15:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:cc:content-type; bh=JEpJbNu2JbOGzdlbcPEX5L6zGUghvTg0dzOJQfnblMA=; b=BjtplCNQlH5iRHP7g9L1Et0LqhuenUR9x/Q5HbC4Jz2un1k7nh+m37M0aWmgbvKpAj J2u+Iqy1bg6i9S4AT9SPrTULB4JOnEF0BuWStLd1Y8MVQ1D1cpzwmtIPMJlrbsrx+ZpN eUzJ28QyykqSL+3KfcQ03LXE6jPyhVlVkjwIM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=HtvV1/dzzERhJH6NoZmebwnq3C1Gs4dDOEpdJoDXMaP+PISpJK1uNLzOWE2H6X+fIt iN/yAMbp+CFR3qRy18jQlr5yFe7X0LiIyKgYtm5/Bnf7HEjmL4jzg8HMvMyq28iPdIsz HZ8PiEHDauyht/ff5NI7GYVD/icDsxqv6aJ4c= MIME-Version: 1.0 Received: by 10.142.3.35 with SMTP id 35mr764621wfc.205.1259111742155; Tue, 24 Nov 2009 17:15:42 -0800 (PST) Date: Wed, 25 Nov 2009 12:15:42 +1100 Message-ID: Subject: [PATCH 2/3] X25: Check for errors in x25_init From: andrew hendry To: netdev@vger.kernel.org Cc: linux-kernel , linux-x25@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Adds error checking to x25_init. Signed-off-by: Andrew Hendry the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -uprN -X a/Documentation/dontdiff a/net/x25/af_x25.c b/net/x25/af_x25.c --- a/net/x25/af_x25.c 2009-11-25 10:21:17.000000000 +1100 +++ b/net/x25/af_x25.c 2009-11-25 10:22:06.000000000 +1100 @@ -1659,18 +1659,31 @@ static int __init x25_init(void) if (rc != 0) goto out; - sock_register(&x25_family_ops); + rc = sock_register(&x25_family_ops); + if (rc != 0) + goto out_proto; dev_add_pack(&x25_packet_type); - register_netdevice_notifier(&x25_dev_notifier); + rc = register_netdevice_notifier(&x25_dev_notifier); + if (rc != 0) + goto out_sock; printk(KERN_INFO "X.25 for Linux Version 0.2\n"); x25_register_sysctl(); - x25_proc_init(); + rc = x25_proc_init(); + if (rc != 0) + goto out_dev; out: return rc; +out_dev: + unregister_netdevice_notifier(&x25_dev_notifier); +out_sock: + sock_unregister(AF_X25); +out_proto: + proto_unregister(&x25_proto); + goto out; } module_init(x25_init); -- To unsubscribe from this list: send the line "unsubscribe netdev" in