Commit e42d68bb authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Ziyang Xuan
Browse files

nfc: llcp: simplify llcp_sock_connect() error paths 

mainline inclusion
from mainline-v5.18-rc1
commit ec10fd15
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I7NLJR
CVE: CVE-2023-3863

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ec10fd154d934cc4195da3cbd017a12817b41d51



---------------------------

The llcp_sock_connect() error paths were using a mixed way of central
exit (goto) and cleanup

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarZiyang Xuan <william.xuanziyang@huawei.com>
parent d966f783

net/nfc/llcp_sock.c

+4 −4
Original line number Diff line number Diff line
@@ -724,10 +724,8 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, 
	llcp_sock->local = nfc_llcp_local_get(local);

	llcp_sock->ssap = nfc_llcp_get_local_ssap(local);

	if (llcp_sock->ssap == LLCP_SAP_MAX) {

		nfc_llcp_local_put(llcp_sock->local);

		llcp_sock->local = NULL;

		ret = -ENOMEM;

		goto put_dev;

		goto sock_llcp_put_local;

	}



	llcp_sock->reserved_ssap = llcp_sock->ssap;
@@ -772,11 +770,13 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, 


sock_llcp_release:

	nfc_llcp_put_ssap(local, llcp_sock->ssap);



sock_llcp_put_local:

	nfc_llcp_local_put(llcp_sock->local);

	llcp_sock->local = NULL;

	llcp_sock->dev = NULL;



put_dev:

	llcp_sock->dev = NULL;

	nfc_put_device(dev);



error: