Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67b23219 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

[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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3becd578

net/bluetooth/bnep/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
			return err;



		if (nsock->sk->sk_state != BT_CONNECTED) {

			fput(nsock->file);

			sockfd_put(nsock);

			return -EBADFD;

		}
@@ -103,7 +103,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
			if (copy_to_user(argp, &ca, sizeof(ca)))

				err = -EFAULT;

		} else

			fput(nsock->file);

			sockfd_put(nsock);



		return err;

net/bluetooth/cmtp/sock.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
			return err;



		if (nsock->sk->sk_state != BT_CONNECTED) {

			fput(nsock->file);

			sockfd_put(nsock);

			return -EBADFD;

		}
@@ -97,7 +97,7 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
			if (copy_to_user(argp, &ca, sizeof(ca)))

				err = -EFAULT;

		} else

			fput(nsock->file);

			sockfd_put(nsock);



		return err;

net/bluetooth/hidp/sock.c

+5 −5
Original line number Diff line number Diff line
@@ -86,13 +86,13 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 


		isock = sockfd_lookup(ca.intr_sock, &err);

		if (!isock) {

			fput(csock->file);

			sockfd_put(csock);

			return err;

		}



		if (csock->sk->sk_state != BT_CONNECTED || isock->sk->sk_state != BT_CONNECTED) {

			fput(csock->file);

			fput(isock->file);

			sockfd_put(csock);

			sockfd_put(isock);

			return -EBADFD;

		}
@@ -101,8 +101,8 @@ static int hidp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
			if (copy_to_user(argp, &ca, sizeof(ca)))

				err = -EFAULT;

		} else {

			fput(csock->file);

			fput(isock->file);

			sockfd_put(csock);

			sockfd_put(isock);

		}



		return err;