Message ID | 1290687525.5053.43.camel@jaunty |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Andrew Hendry <andrew.hendry@gmail.com> Date: Thu, 25 Nov 2010 23:18:45 +1100 > > Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" 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/x25/af_x25.c b/net/x25/af_x25.c index 8cfc419..ad96ee9 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -1562,19 +1562,20 @@ out_dtefac_release: case SIOCX25SCUDMATCHLEN: { struct x25_subaddr sub_addr; rc = -EINVAL; - lock_kernel(); + lock_sock(sk); if(sk->sk_state != TCP_CLOSE) - break; + goto out_cud_release; rc = -EFAULT; if (copy_from_user(&sub_addr, argp, sizeof(sub_addr))) - break; + goto out_cud_release; rc = -EINVAL; if(sub_addr.cudmatchlength > X25_MAX_CUD_LEN) - break; + goto out_cud_release; x25->cudmatchlength = sub_addr.cudmatchlength; - unlock_kernel(); rc = 0; +out_cud_release: + release_sock(sk); break; }
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> --- net/x25/af_x25.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)