kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix possible NULL pointer dereference in OP-TEE driver

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmGU+k0aHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJfWrA//a99LTKcusv3gk2bKMsKk
 L3wUPb+jAK4Y6LiX/rEW+HpltjOp/VD6t49H2h/ELcaZmniuEd1fIVvsaDTTFiCy
 0/UN8rvWm9vrD+BAHmLbxQ0RdHNFKsOnGZfUypSIncq+ViTqh9wMh6FQA3X5wp7J
 62Ry6HC4zswh7aU1LRwUOmadJhEVrFsE2YecWbF/637ysz+g5wjQ1kZ4ew+NJ+8F
 rFxGpL44nTT0S9142N2YVXqiJAEDmcjaudpT6t503TfL0u25bhFh7SyPtPsYH1oY
 bv/odTzwb8uTcncWcUGgj+uhk/nPW3oUDmQc9sYnDNFopiGeckAiimDoqphFeUS5
 jqGxiXmp3KYhk4OJj6WqtBzgezCDM1MHLgqBKQCIYK3EYfbnDFJFuxB5A7NepFdv
 0yHh+YWS/nUUfTgTmESwqzsccXtgy8JtjaHim416HMPdHDghQbKOcup6Ldl36VTW
 17zXv8KI3kl22MS87HpHrLJiotmmFCIgBcTbRuWkafX0O09SkkfVmhDOSJ1aNPXR
 wbgwCSlrkhF34j1tDzcrHYvLaIMHnL73el4QkbZZ+/xP9+b973pMyF8BEFtzKXHy
 LRmAou1Ds2k35P2vhZdgWhgrzb1/px3Ttvt6un1xpV6IHr4m4bDhKrhLHIjbGNug
 nNpwO5bSn6yI0/HTnHNSOQQ=
 =j9Wh
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmGbcbEACgkQmmx57+YA
 GNkdgA/9GTNcXuXKEZWrAdqT9zsKWT9r/VBnPmemO2mFDz5E2PaAAwT1lJJi6cwb
 gq1QhnlTTXqt9CTcbQSDdSQ7wG5kRtGnXz40OyXCcC3cgSBcXTH9bBDKD8Vi9gPZ
 zjS2zu0RDSx/0DPyLMLQiY4mp2TB5LNfwFFqMtKCFfd6xZNAT3KAgr4wnH4mK9c6
 VY94vtHASsE+UEKmvWsL2ffbD4oM68CNhBzY4YzUnHsbFLD7LeRxrZZtuR3sqoAC
 240CS9xooRmWYvW6SUoLp8YyNJVZhBuGXH+VMmWihjn47WCDU95SPegEFF5b9y7p
 ukcZYkee6aDo8KWELdc8O7cBW3N5Qx1rm9QTFWGkbjUzmPW67bTHKC3932vroxXu
 8aW/tkHTfQwDdxp4/i9S7jOghufCeplmPQHCoKBBr+7UjMYsjnaU4z8en0J9yDRi
 MnsmpCsvUDNmWkI7n/4mGZE1WGXCWHcXRffYQkh5vrKeE4+btvDzm4mjoWLGUXVG
 +FvOWosE9qRQoQnE74gKSfkKIPto6jar4biL/rZaFbQMz6Mr71VizEL8H098sFn7
 evKnRKu+aR6t99yngej7Y93wLlcoO2QdvVi+dxannzbH2NsXHFpd+GH88v+gnxov
 sa6gxoUoSMeVW/HY+1/72Z33VyKSPNVnv3lgY7moQ0fz5K0WtBo=
 =f+3A
 -----END PGP SIGNATURE-----

Merge tag 'optee-fix-for-v5.16' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

Fix possible NULL pointer dereference in OP-TEE driver

* tag 'optee-fix-for-v5.16' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  optee: fix kfree NULL pointer

Link: https://lore.kernel.org/r/20211117125747.GA2896197@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-11-22 11:32:15 +01:00
commit d063f30765
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/tee/optee/ffa_abi.c
View file

@ -810,10 +810,9 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
return -EINVAL;
optee = kzalloc(sizeof(*optee), GFP_KERNEL);
if (!optee) {
rc = -ENOMEM;
goto err;
}
if (!optee)
return -ENOMEM;
optee->pool = optee_ffa_config_dyn_shm();
if (IS_ERR(optee->pool)) {
rc = PTR_ERR(optee->pool);