diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /fs/afs/security.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'fs/afs/security.c')
| -rw-r--r-- | fs/afs/security.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/afs/security.c b/fs/afs/security.c index 3ef504370034..bb4ed144d0e4 100644 --- a/fs/afs/security.c +++ b/fs/afs/security.c | |||
| @@ -189,8 +189,9 @@ void afs_cache_permit(struct afs_vnode *vnode, struct key *key, long acl_order) | |||
| 189 | if (!permits) | 189 | if (!permits) |
| 190 | goto out_unlock; | 190 | goto out_unlock; |
| 191 | 191 | ||
| 192 | memcpy(permits->permits, xpermits->permits, | 192 | if (xpermits) |
| 193 | count * sizeof(struct afs_permit)); | 193 | memcpy(permits->permits, xpermits->permits, |
| 194 | count * sizeof(struct afs_permit)); | ||
| 194 | 195 | ||
| 195 | _debug("key %x access %x", | 196 | _debug("key %x access %x", |
| 196 | key_serial(key), vnode->status.caller_access); | 197 | key_serial(key), vnode->status.caller_access); |