mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
Notable bug fixes:
- Ensure SM_NOTIFY doesn't crash the NFS server host - Ensure NLM locks are cleaned up after client reboot - Fix a leak of internal NFSv4 lease information -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEKLLlsBKG3yQ88j7+M2qzM29mf5cFAmH1em4ACgkQM2qzM29m f5drhRAAq8uU+tgABqZNj4aLivUOAionkSiV6Blk1V44DO00yhY2y3dAsOu8bO0k Kh1Yu0QSZeaYDSi2Ak9qCKAl8eNg8lvlxWJ5pQ+GERVJiZj3JJRPSUJI+5r/aQMi k774Y+DzLwPn6/r5iTyymm3vx1wcas+Y/v2nvmHob/G74UKngbhOhP05XS/1MDlM fdTtXVKqLx92grDljTXWCtT5q5mpOc+OFufo2a5+b1aJjUWiU/rraT1mArNlEC7F IMw/eZn6ZnZv+ywbVJFGeRib/Xa7jNeKA+4CQMH+quk/s8rHEaUJqeM5439HLBYk E0KrFAdn+VDV5A6I9TIB1vtykl0KzC/r2u8G4vbA++rfpuxW36lGS95JFnDctGG+ uwk/f4p2+D7oSGt7gLXt8LTOAx0/NeT+OTtUqZRPcoKO7uXvkkCCu2irD9VpGSpD A83Qq0ewT9ntNy0Feik3FgmRSmPTgvywE78MeRFoundd3QhtghUunfY1N2soDt7t 0hyqBhcH8ypWjFoKmv+wAHLPcGcdeg+8T0w3hFPcyTrrdYo/OJl4MNgrIczA2z8O nWCZ+lOZq3QtAkd0eGSFPhnTVebCP5n6yvIfDN4rZc+ASNAqXCR5e1yCDE1gfO+E I1uCcxzewWPe3DsuYWQznEx5u4Rpiml5JF1q5uKFwTNj4UTBFKQ= =IC/r -----END PGP SIGNATURE----- Merge tag 'nfsd-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux Pull nfsd fixes from Chuck Lever: "Notable bug fixes: - Ensure SM_NOTIFY doesn't crash the NFS server host - Ensure NLM locks are cleaned up after client reboot - Fix a leak of internal NFSv4 lease information" * tag 'nfsd-5.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client. lockd: fix failure to cleanup client locks lockd: fix server crash on reboot of client holding lock
This commit is contained in:
commit
88808fbbea
2 changed files with 13 additions and 9 deletions
|
@ -179,19 +179,21 @@ nlm_delete_file(struct nlm_file *file)
|
||||||
static int nlm_unlock_files(struct nlm_file *file)
|
static int nlm_unlock_files(struct nlm_file *file)
|
||||||
{
|
{
|
||||||
struct file_lock lock;
|
struct file_lock lock;
|
||||||
struct file *f;
|
|
||||||
|
|
||||||
|
locks_init_lock(&lock);
|
||||||
lock.fl_type = F_UNLCK;
|
lock.fl_type = F_UNLCK;
|
||||||
lock.fl_start = 0;
|
lock.fl_start = 0;
|
||||||
lock.fl_end = OFFSET_MAX;
|
lock.fl_end = OFFSET_MAX;
|
||||||
for (f = file->f_file[0]; f <= file->f_file[1]; f++) {
|
if (file->f_file[O_RDONLY] &&
|
||||||
if (f && vfs_lock_file(f, F_SETLK, &lock, NULL) < 0) {
|
vfs_lock_file(file->f_file[O_RDONLY], F_SETLK, &lock, NULL))
|
||||||
pr_warn("lockd: unlock failure in %s:%d\n",
|
goto out_err;
|
||||||
__FILE__, __LINE__);
|
if (file->f_file[O_WRONLY] &&
|
||||||
return 1;
|
vfs_lock_file(file->f_file[O_WRONLY], F_SETLK, &lock, NULL))
|
||||||
}
|
goto out_err;
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
|
out_err:
|
||||||
|
pr_warn("lockd: unlock failure in %s:%d\n", __FILE__, __LINE__);
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -4130,8 +4130,10 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
|
||||||
status = nfserr_clid_inuse;
|
status = nfserr_clid_inuse;
|
||||||
if (client_has_state(old)
|
if (client_has_state(old)
|
||||||
&& !same_creds(&unconf->cl_cred,
|
&& !same_creds(&unconf->cl_cred,
|
||||||
&old->cl_cred))
|
&old->cl_cred)) {
|
||||||
|
old = NULL;
|
||||||
goto out;
|
goto out;
|
||||||
|
}
|
||||||
status = mark_client_expired_locked(old);
|
status = mark_client_expired_locked(old);
|
||||||
if (status) {
|
if (status) {
|
||||||
old = NULL;
|
old = NULL;
|
||||||
|
|
Loading…
Add table
Reference in a new issue