SUNRPC: Address buffer overrun in rpc_uaddr2sockaddr()
The size of buf[] must account for the string termination needed for
the first strict_strtoul() call. Introduced in commit a02d6926
.
Fábio Olivé Leite points out that strict_strtoul() requires _either_
'\n\0' _or_ '\0' termination, so use the simpler '\0' here instead.
See http://bugzilla.kernel.org/show_bug.cgi?id=14546 .
Reported-by: argp@census-labs.com
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Fábio Olivé Leite <fleite@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
96d25e5322
commit
1e360a60b2
@ -306,24 +306,25 @@ EXPORT_SYMBOL_GPL(rpc_sockaddr2uaddr);
|
|||||||
* @sap: buffer into which to plant socket address
|
* @sap: buffer into which to plant socket address
|
||||||
* @salen: size of buffer
|
* @salen: size of buffer
|
||||||
*
|
*
|
||||||
|
* @uaddr does not have to be '\0'-terminated, but strict_strtoul() and
|
||||||
|
* rpc_pton() require proper string termination to be successful.
|
||||||
|
*
|
||||||
* Returns the size of the socket address if successful; otherwise
|
* Returns the size of the socket address if successful; otherwise
|
||||||
* zero is returned.
|
* zero is returned.
|
||||||
*/
|
*/
|
||||||
size_t rpc_uaddr2sockaddr(const char *uaddr, const size_t uaddr_len,
|
size_t rpc_uaddr2sockaddr(const char *uaddr, const size_t uaddr_len,
|
||||||
struct sockaddr *sap, const size_t salen)
|
struct sockaddr *sap, const size_t salen)
|
||||||
{
|
{
|
||||||
char *c, buf[RPCBIND_MAXUADDRLEN];
|
char *c, buf[RPCBIND_MAXUADDRLEN + sizeof('\0')];
|
||||||
unsigned long portlo, porthi;
|
unsigned long portlo, porthi;
|
||||||
unsigned short port;
|
unsigned short port;
|
||||||
|
|
||||||
if (uaddr_len > sizeof(buf))
|
if (uaddr_len > RPCBIND_MAXUADDRLEN)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
memcpy(buf, uaddr, uaddr_len);
|
memcpy(buf, uaddr, uaddr_len);
|
||||||
|
|
||||||
buf[uaddr_len] = '\n';
|
buf[uaddr_len] = '\0';
|
||||||
buf[uaddr_len + 1] = '\0';
|
|
||||||
|
|
||||||
c = strrchr(buf, '.');
|
c = strrchr(buf, '.');
|
||||||
if (unlikely(c == NULL))
|
if (unlikely(c == NULL))
|
||||||
return 0;
|
return 0;
|
||||||
@ -332,9 +333,7 @@ size_t rpc_uaddr2sockaddr(const char *uaddr, const size_t uaddr_len,
|
|||||||
if (unlikely(portlo > 255))
|
if (unlikely(portlo > 255))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
c[0] = '\n';
|
*c = '\0';
|
||||||
c[1] = '\0';
|
|
||||||
|
|
||||||
c = strrchr(buf, '.');
|
c = strrchr(buf, '.');
|
||||||
if (unlikely(c == NULL))
|
if (unlikely(c == NULL))
|
||||||
return 0;
|
return 0;
|
||||||
@ -345,8 +344,7 @@ size_t rpc_uaddr2sockaddr(const char *uaddr, const size_t uaddr_len,
|
|||||||
|
|
||||||
port = (unsigned short)((porthi << 8) | portlo);
|
port = (unsigned short)((porthi << 8) | portlo);
|
||||||
|
|
||||||
c[0] = '\0';
|
*c = '\0';
|
||||||
|
|
||||||
if (rpc_pton(buf, strlen(buf), sap, salen) == 0)
|
if (rpc_pton(buf, strlen(buf), sap, salen) == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user