Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299311
b: refs/heads/master
c: e847469
h: refs/heads/master
i:
  299309: 3225689
  299307: 49d5693
  299303: 973015a
  299295: 37d89d1
v: v3
  • Loading branch information
Al Viro committed Apr 13, 2012
1 parent 95e0ffd commit 33b02ed
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 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: 72094e43e3af5020510f920321d71f1798fa896d
refs/heads/master: e847469bf77a1d339274074ed068d461f0c872bc
2 changes: 1 addition & 1 deletion trunk/fs/lockd/clnt4xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static int decode_nlm4_stat(struct xdr_stream *xdr, __be32 *stat)
p = xdr_inline_decode(xdr, 4);
if (unlikely(p == NULL))
goto out_overflow;
if (unlikely(*p > nlm4_failed))
if (unlikely(ntohl(*p) > ntohl(nlm4_failed)))
goto out_bad_xdr;
*stat = *p;
return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/lockd/clntxdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ static int decode_nlm_stat(struct xdr_stream *xdr,
p = xdr_inline_decode(xdr, 4);
if (unlikely(p == NULL))
goto out_overflow;
if (unlikely(*p > nlm_lck_denied_grace_period))
if (unlikely(ntohl(*p) > ntohl(nlm_lck_denied_grace_period)))
goto out_enum;
*stat = *p;
return 0;
Expand Down

0 comments on commit 33b02ed

Please sign in to comment.