aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/bnep
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/bnep
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/bnep')
-rw-r--r--net/bluetooth/bnep/sock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 9ebd3c64474d..81065e548a1f 100644
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -94,7 +94,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
94 return err; 94 return err;
95 95
96 if (nsock->sk->sk_state != BT_CONNECTED) { 96 if (nsock->sk->sk_state != BT_CONNECTED) {
97 fput(nsock->file); 97 sockfd_put(nsock);
98 return -EBADFD; 98 return -EBADFD;
99 } 99 }
100 100
@@ -103,7 +103,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
103 if (copy_to_user(argp, &ca, sizeof(ca))) 103 if (copy_to_user(argp, &ca, sizeof(ca)))
104 err = -EFAULT; 104 err = -EFAULT;
105 } else 105 } else
106 fput(nsock->file); 106 sockfd_put(nsock);
107 107
108 return err; 108 return err;
109 109