3 files changed, 9 insertions, 0 deletions

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 6a3ad8011585..68ff1137dd70 100644
--- 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;
 
+                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;
                 }
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index d61c11170213..cd62bf4289e9 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -42,6 +42,7 @@ struct af_alg_completion {
 struct af_alg_control {
         struct af_alg_iv *iv;
         int op;
+        unsigned int aead_assoclen;
 };
 
 struct af_alg_type {
diff --git a/include/uapi/linux/if_alg.h b/include/uapi/linux/if_alg.h
index 0f9acce5b1ff..f2acd2fde1f3 100644
--- a/include/uapi/linux/if_alg.h
+++ b/include/uapi/linux/if_alg.h
@@ -32,6 +32,8 @@ struct af_alg_iv {
 #define ALG_SET_KEY                     1
 #define ALG_SET_IV                      2
 #define ALG_SET_OP                      3
+#define ALG_SET_AEAD_ASSOCLEN           4
+#define ALG_SET_AEAD_AUTHSIZE           5
 
 /* Operations */
 #define ALG_OP_DECRYPT                  0