Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277911
b: refs/heads/master
c: 65d9d2c
h: refs/heads/master
i:
  277909: 929dd28
  277907: bfd26e8
  277903: 2f9dae9
v: v3
  • Loading branch information
Thomas Meyer authored and David S. Miller committed Nov 21, 2011
1 parent 1943625 commit 8ca15cd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cb508701efa01ba8628ff2d4280dbbb713d62955
refs/heads/master: 65d9d2cac5ee2a33b0cec7044171f67d290e7d6e
6 changes: 2 additions & 4 deletions trunk/net/rxrpc/ar-key.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,9 @@ static int rxrpc_krb5_decode_tagged_data(struct krb5_tagged_data *td,
td->data_len = len;

if (len > 0) {
td->data = kmalloc(len, GFP_KERNEL);
td->data = kmemdup(xdr, len, GFP_KERNEL);
if (!td->data)
return -ENOMEM;
memcpy(td->data, xdr, len);
len = (len + 3) & ~3;
toklen -= len;
xdr += len >> 2;
Expand Down Expand Up @@ -401,10 +400,9 @@ static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen,
_debug("ticket len %u", len);

if (len > 0) {
*_ticket = kmalloc(len, GFP_KERNEL);
*_ticket = kmemdup(xdr, len, GFP_KERNEL);
if (!*_ticket)
return -ENOMEM;
memcpy(*_ticket, xdr, len);
len = (len + 3) & ~3;
toklen -= len;
xdr += len >> 2;
Expand Down

0 comments on commit 8ca15cd

Please sign in to comment.