Skip to content

Commit

Permalink
libceph: define ceph_extract_encoded_string()
Browse files Browse the repository at this point in the history
This adds a new utility routine which will return a dynamically-
allocated buffer containing a string that has been decoded from ceph
over-the-wire format.  It also returns the length of the string
if the address of a size variable is supplied to receive it.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
  • Loading branch information
Alex Elder authored and Sage Weil committed Jul 30, 2012
1 parent ad4f232 commit f8c36c5
Showing 1 changed file with 47 additions and 0 deletions.
47 changes: 47 additions & 0 deletions include/linux/ceph/decode.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef __CEPH_DECODE_H
#define __CEPH_DECODE_H

#include <linux/err.h>
#include <linux/bug.h>
#include <linux/time.h>
#include <asm/unaligned.h>
Expand Down Expand Up @@ -84,6 +85,52 @@ static inline int ceph_has_room(void **p, void *end, size_t n)
ceph_decode_copy(p, pv, n); \
} while (0)

/*
* Allocate a buffer big enough to hold the wire-encoded string, and
* decode the string into it. The resulting string will always be
* terminated with '\0'. If successful, *p will be advanced
* past the decoded data. Also, if lenp is not a null pointer, the
* length (not including the terminating '\0') will be recorded in
* *lenp. Note that a zero-length string is a valid return value.
*
* Returns a pointer to the newly-allocated string buffer, or a
* pointer-coded errno if an error occurs. Neither *p nor *lenp
* will have been updated if an error is returned.
*
* There are two possible failures:
* - converting the string would require accessing memory at or
* beyond the "end" pointer provided (-E
* - memory could not be allocated for the result
*/
static inline char *ceph_extract_encoded_string(void **p, void *end,
size_t *lenp, gfp_t gfp)
{
u32 len;
void *sp = *p;
char *buf;

ceph_decode_32_safe(&sp, end, len, bad);
if (!ceph_has_room(&sp, end, len))
goto bad;

buf = kmalloc(len + 1, gfp);
if (!buf)
return ERR_PTR(-ENOMEM);

if (len)
memcpy(buf, sp, len);
buf[len] = '\0';

*p = (char *) *p + sizeof (u32) + len;
if (lenp)
*lenp = (size_t) len;

return buf;

bad:
return ERR_PTR(-ERANGE);
}

/*
* struct ceph_timespec <-> struct timespec
*/
Expand Down

0 comments on commit f8c36c5

Please sign in to comment.