From a8f04949d76d4f2d7d7c98f467d33aa2a806b2c5 Mon Sep 17 00:00:00 2001 From: Denis Robert Date: Tue, 13 Dec 2011 14:45:05 +0100 Subject: [PATCH] [PORT FROM R2] n_gsm.c: avoid race condition in network interface BZ: 15922 When the RIL ask (via iotcl) to delete the network interface, if a userland proc ess is transfering, the xmit function can be called while the interface is delet ed. The interface is now stopped before deleting it. Move from linux-2.6/drivers/char to linux-2.6/drivers/tty Change-Id: If8e4ad645f6f048ec9b90eb225ef414acf009316 Orig-change-Id: I1e3c9881a7e9e50e30d9d2ac46cfdff4b758b532 Signed-off-by: Vincent Pillet Signed-off-by: Denis Robert Reviewed-on: http://android.intel.com:8080/27176 Reviewed-by: Gross, Mark Reviewed-by: Predon, Frederic Reviewed-by: buildbot Tested-by: buildbot --- drivers/tty/n_gsm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 20035bc..2d5e610 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -2750,6 +2750,7 @@ static void gsm_destroy_network(struct gsm_dlci *dlci) pr_debug("destroy network interface"); if (dlci->net) { + netif_tx_disable(dlci->net); mux_net = (struct gsm_mux_net *)netdev_priv(dlci->net); kref_put(&mux_net->ref, net_free); } -- 2.7.4