5 a.m.
---
src/crypto.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/crypto.c b/src/crypto.c
index 475ebf36..cd50d6f7 100644
--- a/src/crypto.c
+++ b/src/crypto.c
@@ -389,7 +389,9 @@ bool aes_siv_decrypt(const void *key, size_t key_len, const void *in,
if (in_len < 16)
return false;
- memcpy(iov, ad, sizeof(struct iovec) * num_ad);
+ if (ad)
+ memcpy(iov, ad, sizeof(struct iovec) * num_ad);
+
iov[num_ad].iov_base = (void *)out;
iov[num_ad].iov_len = in_len - 16;
num_ad++;
--
2.31.1
5 a.m.
New subject: [PATCH 2/2] offchannel: always use -ECANCELED for cancelation
info->error gets reset to zero on a successful ROC callback
which was getting used for cancelation.
---
src/offchannel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/offchannel.c b/src/offchannel.c
index 4db3fcf2..e01f76c7 100644
--- a/src/offchannel.c
+++ b/src/offchannel.c
@@ -231,7 +231,7 @@ void offchannel_cancel(uint64_t wdev_id, uint32_t id)
destroy:
if (info->destroy)
- info->destroy(info->error, info->user_data);
+ info->destroy(-ECANCELED, info->user_data);
info->destroy = NULL;
info->started = NULL;
--
2.31.1
5:21 a.m.
New subject: [PATCH 2/2] offchannel: always use -ECANCELED for cancelation
Hi James,
On 12/16/21 12:00, James Prestwood wrote:
info->error gets reset to zero on a successful ROC callback
which was getting used for cancelation.
---
src/offchannel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Regards,
-Denis
276
days inactive
276
days old
3 comments
2 participants
participants (2)
-
Denis Kenzior -
James Prestwood