mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
fs: nfs: Fix possible null-pointer dereferences in encode_attrs()
[ Upstream commit e2751463ea
]
In encode_attrs(), there is an if statement on line 1145 to check
whether label is NULL:
if (label && (attrmask[2] & FATTR4_WORD2_SECURITY_LABEL))
When label is NULL, it is used on lines 1178-1181:
*p++ = cpu_to_be32(label->lfs);
*p++ = cpu_to_be32(label->pi);
*p++ = cpu_to_be32(label->len);
p = xdr_encode_opaque_fixed(p, label->label, label->len);
To fix these bugs, label is checked before being used.
These bugs are found by a static analysis tool STCheck written by us.
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
4753e7a824
commit
448deb13ab
1 changed files with 1 additions and 1 deletions
|
@ -1171,7 +1171,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap,
|
||||||
} else
|
} else
|
||||||
*p++ = cpu_to_be32(NFS4_SET_TO_SERVER_TIME);
|
*p++ = cpu_to_be32(NFS4_SET_TO_SERVER_TIME);
|
||||||
}
|
}
|
||||||
if (bmval[2] & FATTR4_WORD2_SECURITY_LABEL) {
|
if (label && (bmval[2] & FATTR4_WORD2_SECURITY_LABEL)) {
|
||||||
*p++ = cpu_to_be32(label->lfs);
|
*p++ = cpu_to_be32(label->lfs);
|
||||||
*p++ = cpu_to_be32(label->pi);
|
*p++ = cpu_to_be32(label->pi);
|
||||||
*p++ = cpu_to_be32(label->len);
|
*p++ = cpu_to_be32(label->len);
|
||||||
|
|
Loading…
Reference in a new issue