diff options
| author | Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru> | 2024-03-07 14:23:50 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-03-11 09:53:22 +0000 |
| commit | d6eb8de2015f0c24822e47356f839167ebde2945 (patch) | |
| tree | 48f20850b5f6836baccc5e1e5c8bb01efe7ac1df /net/x25 | |
| parent | 3ed5f415133f9b7518fbe55ba9ae9a3f5e700929 (diff) | |
| download | linux-stable-d6eb8de2015f0c24822e47356f839167ebde2945.tar.gz linux-stable-d6eb8de2015f0c24822e47356f839167ebde2945.tar.bz2 linux-stable-d6eb8de2015f0c24822e47356f839167ebde2945.zip | |
net/x25: fix incorrect parameter validation in the x25_getsockopt() function
The 'len' variable can't be negative when assigned the result of
'min_t' because all 'min_t' parameters are cast to unsigned int,
and then the minimum one is chosen.
To fix the logic, check 'len' as read from 'optlen',
where the types of relevant variables are (signed) int.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index f7a7c7798c3b..d18d51412cc0 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -460,12 +460,12 @@ static int x25_getsockopt(struct socket *sock, int level, int optname, if (get_user(len, optlen)) goto out; - len = min_t(unsigned int, len, sizeof(int)); - rc = -EINVAL; if (len < 0) goto out; + len = min_t(unsigned int, len, sizeof(int)); + rc = -EFAULT; if (put_user(len, optlen)) goto out; |