lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpc: gss: fix a kmap_atomic race in krb5 code

Browse Source 
This code is never called from interrupt context; it's always run by either
a user thread or rpciod.  So KM_SKB_SUNRPC_DATA is inappropriate here.

Thanks to Aimé Le Rouzic for capturing an oops which showed the kernel
taking an interrupt while we were in this piece of code, resulting in a
nested kmap_atomic(.,KM_SKB_SUNRPC_DATA) call from
xdr_partial_copy_from_skb().

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
J. Bruce Fields
2006-12-04 20:22:32 -05:00
committed by Trond Myklebust
parent 8fc7500bb8
commit 87d918d667
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/sunrpc/auth_gss/gss_krb5_wrap.c
View File

@@ -57,9 +57,9 @@ gss_krb5_remove_padding(struct xdr_buf *buf, int blocksize)
>>PAGE_CACHE_SHIFT; >>PAGE_CACHE_SHIFT;
int offset = (buf->page_base + len - 1) int offset = (buf->page_base + len - 1)
& (PAGE_CACHE_SIZE - 1); & (PAGE_CACHE_SIZE - 1);
ptr = kmap_atomic(buf->pages[last], KM_SKB_SUNRPC_DATA); ptr = kmap_atomic(buf->pages[last], KM_USER0);
pad = *(ptr + offset); pad = *(ptr + offset);
kunmap_atomic(ptr, KM_SKB_SUNRPC_DATA); kunmap_atomic(ptr, KM_USER0);
goto out; goto out;
} else } else
len -= buf->page_len; len -= buf->page_len;