From patchwork Mon Dec 14 22:02:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 41154 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.180.67]) by ozlabs.org (Postfix) with ESMTP id BC0A5B6EEE for ; Tue, 15 Dec 2009 09:03:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758552AbZLNWDA (ORCPT ); Mon, 14 Dec 2009 17:03:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758467AbZLNWC6 (ORCPT ); Mon, 14 Dec 2009 17:02:58 -0500 Received: from mail-pw0-f42.google.com ([209.85.160.42]:35609 "EHLO mail-pw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758539AbZLNWCz (ORCPT ); Mon, 14 Dec 2009 17:02:55 -0500 Received: by pwj9 with SMTP id 9so2206103pwj.21 for ; Mon, 14 Dec 2009 14:02:55 -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:content-type; bh=JEpJbNu2JbOGzdlbcPEX5L6zGUghvTg0dzOJQfnblMA=; b=MaxVEVZ1OuDtZPuDxj8mtCrPYtZGkAcR7fHa+KfGd0fVjyzYNqildMBilfWuzex7i0 dQnkTCsMeVj3nuq4BSMAMY/6Agt0Jze8PZ6Vn18N/jKlIfI5Phbo1L75sHryhbQFZ6rf XlKJtehhU38wPCWyRk0dor9KeWCZqs0NtvrNI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=qyiSDIcSQL/VK5zZw7m0SU6izT8nDfVai2OBIyMarujapul0DTHZGo7xjS2JRg9Dc6 /UxENJcVjpoe3ReuzW5g4yxTHWlORqn7drOker/TczdgwLsfg6qicYw80oiddsJ0o6kA HemPxLzZFVoIA9zMCrX2Cb8KetbYvNsPeo350= MIME-Version: 1.0 Received: by 10.142.5.31 with SMTP id 31mr3574118wfe.78.1260828175335; Mon, 14 Dec 2009 14:02:55 -0800 (PST) Date: Tue, 15 Dec 2009 09:02:55 +1100 Message-ID: Subject: [RESEND PATCH 2/3] X25: Check for errors in x25_init From: andrew hendry To: netdev@vger.kernel.org, linux-kernel 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