git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fs: Fix S_NOSEC handling
[pandora-kernel.git]
/
crypto
/
algif_skcipher.c
diff --git
a/crypto/algif_skcipher.c
b/crypto/algif_skcipher.c
index
6a6dfc0
..
83187f4
100644
(file)
--- a/
crypto/algif_skcipher.c
+++ b/
crypto/algif_skcipher.c
@@
-49,7
+49,7
@@
struct skcipher_ctx {
struct ablkcipher_request req;
};
struct ablkcipher_request req;
};
-#define MAX_SGL_ENTS ((
PAGE_SIZE
- sizeof(struct skcipher_sg_list)) / \
+#define MAX_SGL_ENTS ((
4096
- sizeof(struct skcipher_sg_list)) / \
sizeof(struct scatterlist) - 1)
static inline int skcipher_sndbuf(struct sock *sk)
sizeof(struct scatterlist) - 1)
static inline int skcipher_sndbuf(struct sock *sk)
@@
-378,6
+378,9
@@
static ssize_t skcipher_sendpage(struct socket *sock, struct page *page,
struct skcipher_sg_list *sgl;
int err = -EINVAL;
struct skcipher_sg_list *sgl;
int err = -EINVAL;
+ if (flags & MSG_SENDPAGE_NOTLAST)
+ flags |= MSG_MORE;
+
lock_sock(sk);
if (!ctx->more && ctx->used)
goto unlock;
lock_sock(sk);
if (!ctx->more && ctx->used)
goto unlock;