* [PATCH v3 1/8] sunrpc: use SVC_NET() in svcauth_gss_* functions
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
@ 2018-12-21 17:32 ` Vasily Averin
2018-12-21 17:32 ` [PATCH v3 2/8] sunrpc: introduce svc_rqst->rq_bc_net Vasily Averin
` (6 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:32 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
net/sunrpc/auth_gss/svcauth_gss.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 1ece4bc3eb8d..152790ed309c 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1142,7 +1142,7 @@ static int svcauth_gss_legacy_init(struct svc_rqst *rqstp,
struct kvec *resv = &rqstp->rq_res.head[0];
struct rsi *rsip, rsikey;
int ret;
- struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);
+ struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);
memset(&rsikey, 0, sizeof(rsikey));
ret = gss_read_verf(gc, argv, authp,
@@ -1253,7 +1253,7 @@ static int svcauth_gss_proxy_init(struct svc_rqst *rqstp,
uint64_t handle;
int status;
int ret;
- struct net *net = rqstp->rq_xprt->xpt_net;
+ struct net *net = SVC_NET(rqstp);
struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
memset(&ud, 0, sizeof(ud));
@@ -1444,7 +1444,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
__be32 *rpcstart;
__be32 *reject_stat = resv->iov_base + resv->iov_len;
int ret;
- struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);
+ struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);
dprintk("RPC: svcauth_gss: argv->iov_len = %zd\n",
argv->iov_len);
@@ -1734,7 +1734,7 @@ svcauth_gss_release(struct svc_rqst *rqstp)
struct rpc_gss_wire_cred *gc = &gsd->clcred;
struct xdr_buf *resbuf = &rqstp->rq_res;
int stat = -EINVAL;
- struct sunrpc_net *sn = net_generic(rqstp->rq_xprt->xpt_net, sunrpc_net_id);
+ struct sunrpc_net *sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);
if (gc->gc_proc != RPC_GSS_PROC_DATA)
goto out;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/8] sunrpc: introduce svc_rqst->rq_bc_net
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
2018-12-21 17:32 ` [PATCH v3 1/8] sunrpc: use SVC_NET() in svcauth_gss_* functions Vasily Averin
@ 2018-12-21 17:32 ` Vasily Averin
2018-12-21 17:35 ` [PATCH v3 3/8] sunrpc: introduce per-netns sunrpc_net->bc_prep_reply_hdr() Vasily Averin
` (5 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:32 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
svc_rqst->rq_bc_net points to net namespace used during
backchannel's request processing
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
include/linux/sunrpc/svc.h | 4 +++-
net/sunrpc/svc.c | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 73e130a840ce..23e33f8f0507 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -295,10 +295,12 @@ struct svc_rqst {
struct svc_cacherep * rq_cacherep; /* cache info */
struct task_struct *rq_task; /* service thread */
spinlock_t rq_lock; /* per-request lock */
+ struct net * rq_bc_net; /* pointer to backchannel's
+ * net namespace
+ */
};
#define SVC_NET(svc_rqst) (svc_rqst->rq_xprt->xpt_net)
-
/*
* Rigorous type checking on sockaddr type conversions
*/
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index d13e05f1a990..94a2a85c078b 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1463,6 +1463,7 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
rqstp->rq_xid = req->rq_xid;
rqstp->rq_prot = req->rq_xprt->prot;
rqstp->rq_server = serv;
+ rqstp->rq_bc_net = req->rq_xprt->xprt_net;
rqstp->rq_addrlen = sizeof(req->rq_xprt->addr);
memcpy(&rqstp->rq_addr, &req->rq_xprt->addr, rqstp->rq_addrlen);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 3/8] sunrpc: introduce per-netns sunrpc_net->bc_prep_reply_hdr()
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
2018-12-21 17:32 ` [PATCH v3 1/8] sunrpc: use SVC_NET() in svcauth_gss_* functions Vasily Averin
2018-12-21 17:32 ` [PATCH v3 2/8] sunrpc: introduce svc_rqst->rq_bc_net Vasily Averin
@ 2018-12-21 17:35 ` Vasily Averin
2018-12-21 17:35 ` [PATCH v3 4/8] sunrpc: use-after-free in svc_process_common() Vasily Averin
` (4 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:35 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
Currently svc_process_common() uses quite complex schema to adjust reply
header, only required for tcp transports.
This patch adds an alternative way to access required function:
function pointer is added into per-netns sunrpc_net structure during
creation of back channel svc_xprt.
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
net/sunrpc/netns.h | 2 ++
net/sunrpc/svc_xprt.c | 5 +++++
net/sunrpc/svcsock.c | 3 +++
3 files changed, 10 insertions(+)
diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h
index 7ec10b92bea1..ff067107e4f7 100644
--- a/net/sunrpc/netns.h
+++ b/net/sunrpc/netns.h
@@ -6,6 +6,7 @@
#include <net/netns/generic.h>
struct cache_detail;
+struct svc_rqst;
struct sunrpc_net {
struct proc_dir_entry *proc_net_rpc;
@@ -33,6 +34,7 @@ struct sunrpc_net {
int pipe_version;
atomic_t pipe_users;
struct proc_dir_entry *use_gssp_proc;
+ void (*bc_prep_reply_hdr)(struct svc_rqst *);
};
extern unsigned int sunrpc_net_id;
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 51d36230b6e3..2ffeecfa0978 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -19,6 +19,8 @@
#include <linux/netdevice.h>
#include <trace/events/sunrpc.h>
+#include "netns.h"
+
#define RPCDBG_FACILITY RPCDBG_SVCXPRT
static unsigned int svc_rpc_per_connection_limit __read_mostly;
@@ -134,8 +136,11 @@ static void svc_xprt_free(struct kref *kref)
struct svc_xprt *xprt =
container_of(kref, struct svc_xprt, xpt_ref);
struct module *owner = xprt->xpt_class->xcl_owner;
+ struct sunrpc_net *sn = net_generic(xprt->xpt_net, sunrpc_net_id);
+
if (test_bit(XPT_CACHE_AUTH, &xprt->xpt_flags))
svcauth_unix_info_release(xprt);
+ sn->bc_prep_reply_hdr = NULL;
put_net(xprt->xpt_net);
/* See comment on corresponding get in xs_setup_bc_tcp(): */
if (xprt->xpt_bc_xprt)
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 986f3ed7d1a2..7c0f9439f94c 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -55,6 +55,7 @@
#include <linux/sunrpc/xprt.h>
#include "sunrpc.h"
+#include "netns.h"
#define RPCDBG_FACILITY RPCDBG_SVCXPRT
@@ -1608,6 +1609,7 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv,
{
struct svc_sock *svsk;
struct svc_xprt *xprt;
+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
if (protocol != IPPROTO_TCP) {
printk(KERN_WARNING "svc: only TCP sockets"
@@ -1623,6 +1625,7 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv,
svc_xprt_init(net, &svc_tcp_bc_class, xprt, serv);
set_bit(XPT_CONG_CTRL, &svsk->sk_xprt.xpt_flags);
+ sn->bc_prep_reply_hdr = svc_tcp_prep_reply_hdr;
serv->sv_bc_xprt = xprt;
return xprt;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 4/8] sunrpc: use-after-free in svc_process_common()
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
` (2 preceding siblings ...)
2018-12-21 17:35 ` [PATCH v3 3/8] sunrpc: introduce per-netns sunrpc_net->bc_prep_reply_hdr() Vasily Averin
@ 2018-12-21 17:35 ` Vasily Averin
2018-12-21 17:35 ` [PATCH v3 5/8] nfs: remove sv_bc_enabled using in svc_is_backchannel() Vasily Averin
` (3 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:35 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
if node have NFSv41+ mounts inside several net namespaces
it can lead to use-after-free in svc_process_common()
svc_process_common()
/* Setup reply header */
rqstp->rq_xprt->xpt_ops->xpo_prep_reply_hdr(rqstp); <<< HERE
svc_process_common() can use already freed rqstp->rq_xprt,
it was assigned in bc_svc_process() where it was taken from serv->sv_bc_xprt.
serv is global structure but sv_bc_xprt is assigned per-netnamespace.
According to Trond, the whole "let's set up rqstp->rq_xprt
for the back channel" is nothing but a giant hack in order
to work around the fact that svc_process_common() uses it
to find the xpt_ops, and perform a couple of (meaningless
for the back channel) tests of xpt_flags.
All we really need in svc_process_common() is to be able to run
rqstp->rq_xprt->xpt_ops->xpo_prep_reply_hdr()
Bruce J Fields points that this xpo_prep_reply_hdr() call
is an awfully roundabout way just to do "svc_putnl(resv, 0);"
in the tcp case.
This patch removes rqstp->rq_xprt set up in bc_svc_process(),
now it calls svc_process_common() with rqstp->rq_xprt = NULL.
Patch adjust SVC_NET() definition and adopt function called
from svc_process_common() to proprly handle this situation.
To adjust reply header patch calls bc_reply_hdr() function pointer
saved on per-netns sunrpc_net structure.
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
include/linux/sunrpc/svc.h | 2 +-
include/trace/events/sunrpc.h | 6 ++++--
net/sunrpc/svc.c | 17 ++++++++++++-----
net/sunrpc/svc_xprt.c | 5 +++--
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 23e33f8f0507..670596f4fdf7 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -300,7 +300,7 @@ struct svc_rqst {
*/
};
-#define SVC_NET(svc_rqst) (svc_rqst->rq_xprt->xpt_net)
+#define SVC_NET(rqst) (rqst->rq_xprt ? rqst->rq_xprt->xpt_net : rqst->rq_bc_net)
/*
* Rigorous type checking on sockaddr type conversions
*/
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 28e384186c35..8617f4fd6b70 100644
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -569,7 +569,8 @@ TRACE_EVENT(svc_process,
__field(u32, vers)
__field(u32, proc)
__string(service, name)
- __string(addr, rqst->rq_xprt->xpt_remotebuf)
+ __string(addr, rqst->rq_xprt ?
+ rqst->rq_xprt->xpt_remotebuf : "(null)")
),
TP_fast_assign(
@@ -577,7 +578,8 @@ TRACE_EVENT(svc_process,
__entry->vers = rqst->rq_vers;
__entry->proc = rqst->rq_proc;
__assign_str(service, name);
- __assign_str(addr, rqst->rq_xprt->xpt_remotebuf);
+ __assign_str(addr, rqst->rq_xprt ?
+ rqst->rq_xprt->xpt_remotebuf : "(null)");
),
TP_printk("addr=%s xid=0x%08x service=%s vers=%u proc=%u",
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 94a2a85c078b..4cf0f0776179 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -30,6 +30,8 @@
#include <trace/events/sunrpc.h>
+#include "netns.h"
+
#define RPCDBG_FACILITY RPCDBG_SVCDSP
static void svc_unregister(const struct svc_serv *serv, struct net *net);
@@ -1153,6 +1155,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
struct svc_program *progp;
const struct svc_version *versp = NULL; /* compiler food */
const struct svc_procedure *procp = NULL;
+ struct sunrpc_net *sn;
struct svc_serv *serv = rqstp->rq_server;
__be32 *statp;
u32 prog, vers, proc;
@@ -1172,8 +1175,13 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
clear_bit(RQ_DROPME, &rqstp->rq_flags);
/* Setup reply header */
- rqstp->rq_xprt->xpt_ops->xpo_prep_reply_hdr(rqstp);
-
+ if (rqstp->rq_xprt)
+ rqstp->rq_xprt->xpt_ops->xpo_prep_reply_hdr(rqstp);
+ else {
+ sn = net_generic(SVC_NET(rqstp), sunrpc_net_id);
+ if (sn->bc_prep_reply_hdr)
+ sn->bc_prep_reply_hdr(rqstp);
+ }
svc_putu32(resv, rqstp->rq_xid);
vers = svc_getnl(argv);
@@ -1244,7 +1252,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
* for lower versions. RPC_PROG_MISMATCH seems to be the closest
* fit.
*/
- if (versp->vs_need_cong_ctrl &&
+ if (versp->vs_need_cong_ctrl && rqstp->rq_xprt &&
!test_bit(XPT_CONG_CTRL, &rqstp->rq_xprt->xpt_flags))
goto err_bad_vers;
@@ -1336,7 +1344,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
return 0;
close:
- if (test_bit(XPT_TEMP, &rqstp->rq_xprt->xpt_flags))
+ if (rqstp->rq_xprt && test_bit(XPT_TEMP, &rqstp->rq_xprt->xpt_flags))
svc_close_xprt(rqstp->rq_xprt);
dprintk("svc: svc_process close\n");
return 0;
@@ -1459,7 +1467,6 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
dprintk("svc: %s(%p)\n", __func__, req);
/* Build the svc_rqst used by the common processing routine */
- rqstp->rq_xprt = serv->sv_bc_xprt;
rqstp->rq_xid = req->rq_xid;
rqstp->rq_prot = req->rq_xprt->prot;
rqstp->rq_server = serv;
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 2ffeecfa0978..728ccd4d4490 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -473,10 +473,11 @@ static struct svc_xprt *svc_xprt_dequeue(struct svc_pool *pool)
*/
void svc_reserve(struct svc_rqst *rqstp, int space)
{
+ struct svc_xprt *xprt = rqstp->rq_xprt;
+
space += rqstp->rq_res.head[0].iov_len;
- if (space < rqstp->rq_reserved) {
- struct svc_xprt *xprt = rqstp->rq_xprt;
+ if (xprt && (space < rqstp->rq_reserved)) {
atomic_sub((rqstp->rq_reserved - space), &xprt->xpt_reserved);
rqstp->rq_reserved = space;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 5/8] nfs: remove sv_bc_enabled using in svc_is_backchannel()
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
` (3 preceding siblings ...)
2018-12-21 17:35 ` [PATCH v3 4/8] sunrpc: use-after-free in svc_process_common() Vasily Averin
@ 2018-12-21 17:35 ` Vasily Averin
2018-12-21 17:35 ` [PATCH v3 6/8] sunrpc: make visible processing error in bc_svc_process() Vasily Averin
` (2 subsequent siblings)
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:35 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
serv->sv_bc_xprt cannot be used as pointer,
serv is global structure, but sv_bc_xprt is assigned per-netnamespace.
The only user of this field is svc_is_backchannel() where it is used
not as pointer but as mark of backchannel-compatible servers.
Convert netns-unsafe xprt pointer to simple boolean mark.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
include/linux/sunrpc/bc_xprt.h | 10 ++++------
include/linux/sunrpc/svc.h | 2 +-
net/sunrpc/svcsock.c | 2 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/include/linux/sunrpc/bc_xprt.h b/include/linux/sunrpc/bc_xprt.h
index 28721cf73ec3..4e8c773d02be 100644
--- a/include/linux/sunrpc/bc_xprt.h
+++ b/include/linux/sunrpc/bc_xprt.h
@@ -47,11 +47,9 @@ void xprt_free_bc_rqst(struct rpc_rqst *req);
/*
* Determine if a shared backchannel is in use
*/
-static inline int svc_is_backchannel(const struct svc_rqst *rqstp)
+static inline bool svc_is_backchannel(const struct svc_rqst *rqstp)
{
- if (rqstp->rq_server->sv_bc_xprt)
- return 1;
- return 0;
+ return rqstp->rq_server->sv_bc_enabled;
}
#else /* CONFIG_SUNRPC_BACKCHANNEL */
static inline int xprt_setup_backchannel(struct rpc_xprt *xprt,
@@ -60,9 +58,9 @@ static inline int xprt_setup_backchannel(struct rpc_xprt *xprt,
return 0;
}
-static inline int svc_is_backchannel(const struct svc_rqst *rqstp)
+static inline bool svc_is_backchannel(const struct svc_rqst *rqstp)
{
- return 0;
+ return false;
}
static inline void xprt_free_bc_request(struct rpc_rqst *req)
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 670596f4fdf7..8162d67d121f 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -109,7 +109,7 @@ struct svc_serv {
spinlock_t sv_cb_lock; /* protects the svc_cb_list */
wait_queue_head_t sv_cb_waitq; /* sleep here if there are no
* entries in the svc_cb_list */
- struct svc_xprt *sv_bc_xprt; /* callback on fore channel */
+ bool sv_bc_enabled; /* server uses backchannel */
#endif /* CONFIG_SUNRPC_BACKCHANNEL */
};
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 7c0f9439f94c..284104087190 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1626,7 +1626,7 @@ static struct svc_xprt *svc_bc_create_socket(struct svc_serv *serv,
set_bit(XPT_CONG_CTRL, &svsk->sk_xprt.xpt_flags);
sn->bc_prep_reply_hdr = svc_tcp_prep_reply_hdr;
- serv->sv_bc_xprt = xprt;
+ serv->sv_bc_enabled = true;
return xprt;
}
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 2f7ec8912f49..88694048d5c0 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -136,7 +136,7 @@ static struct svc_xprt *svc_rdma_bc_create(struct svc_serv *serv,
svc_xprt_init(net, &svc_rdma_bc_class, xprt, serv);
set_bit(XPT_CONG_CTRL, &xprt->xpt_flags);
- serv->sv_bc_xprt = xprt;
+ serv->sv_bc_enabled = true;
dprintk("svcrdma: %s(%p)\n", __func__, xprt);
return xprt;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 6/8] sunrpc: make visible processing error in bc_svc_process()
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
` (4 preceding siblings ...)
2018-12-21 17:35 ` [PATCH v3 5/8] nfs: remove sv_bc_enabled using in svc_is_backchannel() Vasily Averin
@ 2018-12-21 17:35 ` Vasily Averin
2018-12-21 17:36 ` [PATCH v3 7/8] sunrpc: fix debug message in svc_create_xprt() Vasily Averin
2018-12-21 17:36 ` [PATCH v3 8/8] nfs: minor typo in nfs4_callback_up_net() Vasily Averin
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:35 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
net/sunrpc/svc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 4cf0f0776179..baeade37b0a0 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -1507,9 +1507,9 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req,
if (!proc_error) {
/* Processing error: drop the request */
xprt_free_bc_request(req);
- return 0;
+ error = -EINVAL;
+ goto out;
}
-
/* Finally, send the reply synchronously */
memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));
task = rpc_run_bc_task(req);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 7/8] sunrpc: fix debug message in svc_create_xprt()
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
` (5 preceding siblings ...)
2018-12-21 17:35 ` [PATCH v3 6/8] sunrpc: make visible processing error in bc_svc_process() Vasily Averin
@ 2018-12-21 17:36 ` Vasily Averin
2018-12-21 17:36 ` [PATCH v3 8/8] nfs: minor typo in nfs4_callback_up_net() Vasily Averin
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:36 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
_svc_create_xprt() returns positive port number
so its non-zero return value is not an error
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
net/sunrpc/svc_xprt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index 728ccd4d4490..834fedb441ef 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -301,9 +301,9 @@ int svc_create_xprt(struct svc_serv *serv, const char *xprt_name,
request_module("svc%s", xprt_name);
err = _svc_create_xprt(serv, xprt_name, net, family, port, flags);
}
- if (err)
+ if (err < 0)
dprintk("svc: transport %s not found, err %d\n",
- xprt_name, err);
+ xprt_name, -err);
return err;
}
EXPORT_SYMBOL_GPL(svc_create_xprt);
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 8/8] nfs: minor typo in nfs4_callback_up_net()
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
` (6 preceding siblings ...)
2018-12-21 17:36 ` [PATCH v3 7/8] sunrpc: fix debug message in svc_create_xprt() Vasily Averin
@ 2018-12-21 17:36 ` Vasily Averin
7 siblings, 0 replies; 8+ messages in thread
From: Vasily Averin @ 2018-12-21 17:36 UTC (permalink / raw)
To: Trond Myklebust, Anna Schumaker
Cc: J. Bruce Fields, Jeff Layton, Chuck Lever, linux-nfs, Evgenii Shatokhin
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
fs/nfs/callback.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 509dc5adeb8f..52d8e1681eec 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -56,7 +56,7 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net)
nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);
if (ret > 0) {
nn->nfs_callback_tcpport6 = ret;
- dprintk("NFS: Callback listener port = %u (af %u, net %x\n",
+ dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",
nn->nfs_callback_tcpport6, PF_INET6, net->ns.inum);
} else if (ret != -EAFNOSUPPORT)
goto out_err;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-12-21 17:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cover.1545412216.git.vvs@virtuozzo.com>
2018-12-21 17:32 ` [PATCH v3 1/8] sunrpc: use SVC_NET() in svcauth_gss_* functions Vasily Averin
2018-12-21 17:32 ` [PATCH v3 2/8] sunrpc: introduce svc_rqst->rq_bc_net Vasily Averin
2018-12-21 17:35 ` [PATCH v3 3/8] sunrpc: introduce per-netns sunrpc_net->bc_prep_reply_hdr() Vasily Averin
2018-12-21 17:35 ` [PATCH v3 4/8] sunrpc: use-after-free in svc_process_common() Vasily Averin
2018-12-21 17:35 ` [PATCH v3 5/8] nfs: remove sv_bc_enabled using in svc_is_backchannel() Vasily Averin
2018-12-21 17:35 ` [PATCH v3 6/8] sunrpc: make visible processing error in bc_svc_process() Vasily Averin
2018-12-21 17:36 ` [PATCH v3 7/8] sunrpc: fix debug message in svc_create_xprt() Vasily Averin
2018-12-21 17:36 ` [PATCH v3 8/8] nfs: minor typo in nfs4_callback_up_net() Vasily Averin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).