aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/cmtp
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-01-08 01:38:42 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:00:48 -0500
commit67b23219ce2f78352b0c566a472ff16c1b0fea9a (patch)
treec02e09a072d3461505033374e1026000abe2b753 /net/bluetooth/cmtp
parent3becd578c5c9aafde6f562bb1dfe20d420bce6e8 (diff)
[BLUETOOTH]: Use sockfd_put()
The function sockfd_lookup uses fget on the value that is stored in the file field of the returned structure, so fput should ultimately be applied to this value. This can be done directly, but it seems better to use the specific macro sockfd_put, which does the same thing. The problem was fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ expression s; @@ s = sockfd_lookup(...) ... + sockfd_put(s); ?- fput(s->file); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/cmtp')
-rw-r--r--net/bluetooth/cmtp/sock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 783edab12ce8..8c7f7bc4e0ba 100644
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -88,7 +88,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
88 return err; 88 return err;
89 89
90 if (nsock->sk->sk_state != BT_CONNECTED) { 90 if (nsock->sk->sk_state != BT_CONNECTED) {
91 fput(nsock->file); 91 sockfd_put(nsock);
92 return -EBADFD; 92 return -EBADFD;
93 } 93 }
94 94
@@ -97,7 +97,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
97 if (copy_to_user(argp, &ca, sizeof(ca))) 97 if (copy_to_user(argp, &ca, sizeof(ca)))
98 err = -EFAULT; 98 err = -EFAULT;
99 } else 99 } else
100 fput(nsock->file); 100 sockfd_put(nsock);
101 101
102 return err; 102 return err;
103 103