Skip to content

Commit

Permalink
net/9p: Check errno validity
Browse files Browse the repository at this point in the history
While working on a modified server I had the Linux clients crash
a few times. This lead me to find this:

Some error codes are directly extracted from the server replies.
A malformed server reply could contain an invalid error code, with a
very large value. If this value is then passed to ERR_PTR() it will
not be properly detected as an error code by IS_ERR() and as a result
the kernel will dereference an invalid pointer.

This patch tries to avoid this.

Signed-off-by: Simon Derr <simon.derr@bull.net>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  • Loading branch information
Simon Derr authored and Eric Van Hensbergen committed Sep 6, 2012
1 parent ba413ab commit 43def35
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions net/9p/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,20 @@ inline int p9_is_proto_dotu(struct p9_client *clnt)
}
EXPORT_SYMBOL(p9_is_proto_dotu);

/*
* Some error codes are taken directly from the server replies,
* make sure they are valid.
*/
static int safe_errno(int err)
{
if ((err > 0) || (err < -MAX_ERRNO)) {
p9_debug(P9_DEBUG_ERROR, "Invalid error code %d\n", err);
return -EPROTO;
}
return err;
}


/* Interpret mount option for protocol version */
static int get_protocol_version(char *s)
{
Expand Down Expand Up @@ -782,7 +796,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...)
return req;
reterr:
p9_free_req(c, req);
return ERR_PTR(err);
return ERR_PTR(safe_errno(err));
}

/**
Expand Down Expand Up @@ -865,7 +879,7 @@ static struct p9_req_t *p9_client_zc_rpc(struct p9_client *c, int8_t type,
return req;
reterr:
p9_free_req(c, req);
return ERR_PTR(err);
return ERR_PTR(safe_errno(err));
}

static struct p9_fid *p9_fid_create(struct p9_client *clnt)
Expand Down

0 comments on commit 43def35

Please sign in to comment.