This is just one fix for a NULL dereference if someone happens to read
/proc/fs/nfsd/client/../state at the wrong moment. -----BEGIN PGP SIGNATURE----- iQJJBAABCAAzFiEEYtFWavXG9hZotryuJ5vNeUKO4b4FAl8bWF4VHGJmaWVsZHNA ZmllbGRzZXMub3JnAAoJECebzXlCjuG+CL4P/1z2k9OPSTxNpcTv/+5+DCg5gEVp raF3zumeMc8b0gvSRzrMLpYWRZBO/ZcDrH10WFPvySQxQGhMzPNDYsOvRcGabUOs SDMV7RCQe7fPNlRSZejdTLnWD1ftHgNLXpBKSXPR0GbmML4BRoKwHjTM4rrr3nox bluQHFyAHMwrNSjjRufi5qi14ThyW5qIanSEpV99qS+aeFwx0U8FL4f4eyFMA1Pq sV/H2k9N1v/xoPOqQWF20EOZqI+AMxexMY2EQBm7LS3kv5IReSV6WTM4bcTNDl/7 jtFA3A9pIngwfh2d8BOEC12BzPmw1F1vo2kbBjvPzeo1EgtD+EN8RjJ9MP9Lwz3v kOL09hkJrvtM24+g+VOzdwGEknxm09vmps3vyhth5EvLSLNzJwGfY7HisRxIOrmT HZBzFNM/wX6RkzsIyrx+AjoqwmOYiz/diElE1oLGLVFrp3IVhk9Grv0IdNlWl8U5 ImtlewJY9vF6+HAsOToXZaPJGS9PBuLWwGj0zrXn5Gr+gNqZfFGLUBfz3sTVxku5 5xa34kECCV7ECGwtHGQ+X0Lp/1jhbAUxdTW0ZI1rJiWtdmx9WJttlmdxmX3dASso PmBGYCVynMDIaGrnnQ5kig7X9aUy1GF+P9OnZ+tE5FkFdHgG3i4kjOwyOGjtTTen YmsqNI4KBwV1wBZf =lzOL -----END PGP SIGNATURE----- Merge tag 'nfsd-5.8-2' of git://linux-nfs.org/~bfields/linux into master Pull nfsd fix from Bruce Fields: "Just one fix for a NULL dereference if someone happens to read /proc/fs/nfsd/client/../state at the wrong moment" * tag 'nfsd-5.8-2' of git://linux-nfs.org/~bfields/linux: nfsd4: fix NULL dereference in nfsd/clients display code
This commit is contained in:
Коммит
5876aa073f
|
@ -507,6 +507,17 @@ find_any_file(struct nfs4_file *f)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static struct nfsd_file *find_deleg_file(struct nfs4_file *f)
|
||||
{
|
||||
struct nfsd_file *ret = NULL;
|
||||
|
||||
spin_lock(&f->fi_lock);
|
||||
if (f->fi_deleg_file)
|
||||
ret = nfsd_file_get(f->fi_deleg_file);
|
||||
spin_unlock(&f->fi_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static atomic_long_t num_delegations;
|
||||
unsigned long max_delegations;
|
||||
|
||||
|
@ -2444,6 +2455,8 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)
|
|||
oo = ols->st_stateowner;
|
||||
nf = st->sc_file;
|
||||
file = find_any_file(nf);
|
||||
if (!file)
|
||||
return 0;
|
||||
|
||||
seq_printf(s, "- ");
|
||||
nfs4_show_stateid(s, &st->sc_stateid);
|
||||
|
@ -2481,6 +2494,8 @@ static int nfs4_show_lock(struct seq_file *s, struct nfs4_stid *st)
|
|||
oo = ols->st_stateowner;
|
||||
nf = st->sc_file;
|
||||
file = find_any_file(nf);
|
||||
if (!file)
|
||||
return 0;
|
||||
|
||||
seq_printf(s, "- ");
|
||||
nfs4_show_stateid(s, &st->sc_stateid);
|
||||
|
@ -2513,7 +2528,9 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)
|
|||
|
||||
ds = delegstateid(st);
|
||||
nf = st->sc_file;
|
||||
file = nf->fi_deleg_file;
|
||||
file = find_deleg_file(nf);
|
||||
if (!file)
|
||||
return 0;
|
||||
|
||||
seq_printf(s, "- ");
|
||||
nfs4_show_stateid(s, &st->sc_stateid);
|
||||
|
@ -2529,6 +2546,7 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)
|
|||
seq_printf(s, ", ");
|
||||
nfs4_show_fname(s, file);
|
||||
seq_printf(s, " }\n");
|
||||
nfsd_file_put(file);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче