[04/16] crypto: AF_ALG - consolidate RX buffer service functions

Commit Message

Stephan Mueller July 31, 2017, 12:06 p.m. UTC

Consolidate the common functions verifying the RX buffers:

 * skcipher_rcvbuf, aead_rcvbuf ==> af_alg_rcvbuf

 * skcipher_readable, aead_readable ==> af_alg_readable

Signed-off-by: Stephan Mueller <[e-mail]>
---
 crypto/algif_aead.c     | 16 +---------------
 crypto/algif_skcipher.c | 16 +---------------
 include/crypto/if_alg.h | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 30 deletions(-)

Patch

diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c
index c923ce29bfe3..cdcf186296bd 100644
--- a/crypto/algif_aead.c
+++ b/crypto/algif_aead.c
@@ -47,20 +47,6 @@  struct aead_tfm {
 	struct crypto_skcipher *null_tfm;
 };
 
-static inline int aead_rcvbuf(struct sock *sk)
-{
-	struct alg_sock *ask = alg_sk(sk);
-	struct af_alg_ctx *ctx = ask->private;
-
-	return max_t(int, max_t(int, sk->sk_rcvbuf & PAGE_MASK, PAGE_SIZE) -
-			  ctx->rcvused, 0);
-}
-
-static inline bool aead_readable(struct sock *sk)
-{
-	return PAGE_SIZE <= aead_rcvbuf(sk);
-}
-
 static inline bool aead_sufficient_data(struct sock *sk)
 {
 	struct alg_sock *ask = alg_sk(sk);
@@ -655,7 +641,7 @@  static int _aead_recvmsg(struct socket *sock, struct msghdr *msg,
 		size_t seglen;
 
 		/* limit the amount of readable buffers */
-		if (!aead_readable(sk))
+		if (!af_alg_readable(sk))
 			break;
 
 		if (!ctx->used) {
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index a5c6643f2abe..081df927fb8b 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -44,20 +44,6 @@  struct skcipher_tfm {
 	bool has_key;
 };
 
-static inline int skcipher_rcvbuf(struct sock *sk)
-{
-	struct alg_sock *ask = alg_sk(sk);
-	struct af_alg_ctx *ctx = ask->private;
-
-	return max_t(int, max_t(int, sk->sk_rcvbuf & PAGE_MASK, PAGE_SIZE) -
-			  ctx->rcvused, 0);
-}
-
-static inline bool skcipher_readable(struct sock *sk)
-{
-	return PAGE_SIZE <= skcipher_rcvbuf(sk);
-}
-
 static int skcipher_alloc_tsgl(struct sock *sk)
 {
 	struct alg_sock *ask = alg_sk(sk);
@@ -532,7 +518,7 @@  static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg,
 		size_t seglen;
 
 		/* limit the amount of readable buffers */
-		if (!skcipher_readable(sk))
+		if (!af_alg_readable(sk))
 			break;
 
 		if (!ctx->used) {
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h
index 79d215f65acf..e1ac57c32d85 100644
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -214,4 +214,30 @@  static inline bool af_alg_writable(struct sock *sk)
 	return PAGE_SIZE <= af_alg_sndbuf(sk);
 }
 
+/**
+ * Size of available buffer used by kernel for the RX user space operation.
+ *
+ * @sk socket of connection to user space
+ * @return number of bytes still available
+ */
+static inline int af_alg_rcvbuf(struct sock *sk)
+{
+	struct alg_sock *ask = alg_sk(sk);
+	struct af_alg_ctx *ctx = ask->private;
+
+	return max_t(int, max_t(int, sk->sk_rcvbuf & PAGE_MASK, PAGE_SIZE) -
+			  ctx->rcvused, 0);
+}
+
+/**
+ * Can the RX buffer still be written to?
+ *
+ * @sk socket of connection to user space
+ * @return true => writable, false => not writable
+ */
+static inline bool af_alg_readable(struct sock *sk)
+{
+	return PAGE_SIZE <= af_alg_rcvbuf(sk);
+}
+
 #endif	/* _CRYPTO_IF_ALG_H */