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

Commit b65b0f67 authored by David Howells's avatar David Howells Committed by Sasha Levin
Browse files

VFS: net/unix: d_backing_inode() annotations 



[ Upstream commit a25b376bded1ba7fd1d455e140d723b7de2e343c ]

places where we are dealing with S_ISSOCK file creation/lookups.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent d420f00c

net/unix/af_unix.c

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static struct sock *unix_find_socket_byinode(struct inode *i) 
		    &unix_socket_table[i->i_ino & (UNIX_HASH_SIZE - 1)]) {

		struct dentry *dentry = unix_sk(s)->path.dentry;



		if (dentry && dentry->d_inode == i) {

		if (dentry && d_backing_inode(dentry) == i) {

			sock_hold(s);

			goto found;

		}
@@ -898,7 +898,7 @@ static struct sock *unix_find_other(struct net *net, 
		err = kern_path(sunname->sun_path, LOOKUP_FOLLOW, &path);

		if (err)

			goto fail;

		inode = path.dentry->d_inode;

		inode = d_backing_inode(path.dentry);

		err = inode_permission(inode, MAY_WRITE);

		if (err)

			goto put_fail;
@@ -1025,7 +1025,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
			goto out_up;

		}

		addr->hash = UNIX_HASH_SIZE;

		hash = path.dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1);

		hash = d_backing_inode(path.dentry)->i_ino & (UNIX_HASH_SIZE-1);

		spin_lock(&unix_table_lock);

		u->path = path;

		list = &unix_socket_table[hash];

net/unix/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int sk_diag_dump_vfs(struct sock *sk, struct sk_buff *nlskb) 


	if (dentry) {

		struct unix_diag_vfs uv = {

			.udiag_vfs_ino = dentry->d_inode->i_ino,

			.udiag_vfs_ino = d_backing_inode(dentry)->i_ino,

			.udiag_vfs_dev = dentry->d_sb->s_dev,

		};