diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-19 19:58:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-19 19:58:21 +0300 |
| commit | dcf7d9e0aee523e588aa3d5ce7394043cd2dea9e (patch) | |
| tree | c7edbafc25f2a93c75366dae1b1ab08e76372b75 /include | |
| parent | e8442d5b7bc6338d553040f5b1f7bd43f5ab30e0 (diff) | |
| parent | 1b34cbbf4f011a121ef7b2d7d6e6920a036d5285 (diff) | |
| download | linux-dcf7d9e0aee523e588aa3d5ce7394043cd2dea9e.tar.xz | |
Merge tag 'v6.17-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a NULL pointer dereference in ccp and a couple of bugs in
the af_alg interface"
* tag 'v6.17-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg
crypto: af_alg - Set merge to zero early in af_alg_sendmsg
crypto: ccp - Always pass in an error pointer to __sev_platform_shutdown_locked()
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/if_alg.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index f7b3b93f3a49..0c70f3a55575 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -135,6 +135,7 @@ struct af_alg_async_req { * SG? * @enc: Cryptographic operation to be performed when * recvmsg is invoked. + * @write: True if we are in the middle of a write. * @init: True if metadata has been sent. * @len: Length of memory allocated for this data structure. * @inflight: Non-zero when AIO requests are in flight. @@ -151,10 +152,11 @@ struct af_alg_ctx { size_t used; atomic_t rcvused; - bool more; - bool merge; - bool enc; - bool init; + u32 more:1, + merge:1, + enc:1, + write:1, + init:1; unsigned int len; |