projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-mpx-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
crypto
/
af_alg.c
diff --git
a/crypto/af_alg.c
b/crypto/af_alg.c
index bc21f520d489d0d3d445269ff282faf1b80c1905..1fa7bc31be63b9fb774782ebe3fbdaed0b16ff72 100644
(file)
--- a/
crypto/af_alg.c
+++ b/
crypto/af_alg.c
@@
-421,6
+421,12
@@
int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con)
con->op = *(u32 *)CMSG_DATA(cmsg);
break;
con->op = *(u32 *)CMSG_DATA(cmsg);
break;
+ case ALG_SET_AEAD_ASSOCLEN:
+ if (cmsg->cmsg_len < CMSG_LEN(sizeof(u32)))
+ return -EINVAL;
+ con->aead_assoclen = *(u32 *)CMSG_DATA(cmsg);
+ break;
+
default:
return -EINVAL;
}
default:
return -EINVAL;
}
This page took
0.023675 seconds
and
5
git commands to generate.