nfsd: Add quotes to client info 'callback address'
Subsystems (2)
PATCH 1/1 nfsd: Add quotes to client info 'callback address'
The 'callback address' in client_info_show is output without quotes causing yaml parsers to fail on processing IPv6 addresses. Adding quotes to 'callback address' also matches that used by the 'address' field.
--- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfsd/nfs4state.c +1 -1
@@ -2692,7 +2692,7 @@ static int client_info_show(struct seq_file *m, void *v) clp->cl_nii_time.tv_sec, clp->cl_nii_time.tv_nsec); }seq_printf (m,"callback state: %s\n" ,cb_state2str (clp->cl_cb_state)); -seq_printf (m,"callback address: %pISpc\n" , &clp->cl_cb_conn.cb_addr); +seq_printf (m,"callback address: \"%pISpc\"\n" , &clp->cl_cb_conn.cb_addr);seq_printf (m,"admin-revoked states: %d\n" ,atomic_read (&clp->cl_admin_revoked));drop_client (clp);
Signature · 1 line
2.39.2
Quoted 4 lines · Mark Grimes
The 'callback address' in
client_info_showis output without quotes causing yaml parsers to fail on processing IPv6 addresses. Adding quotes to 'callback address' also matches that used by the 'address' field.
It is conceivable that existing code already handles the existing format and could break, but it seems unlikely. nfs-utils has code to parse this file but it ignores "callback address" and doesn't care about the content of "address" just including it in logs.
Consistency with "address" is a strong argument - strong enough to risk the unlikely breakage.
Thanks,
NeilBrown
Quoted 23 lines
Signed-off-by Mark Grimes <[email protected]>--- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/nfsd/nfs4state.c +1
-1@@ -2692,7 +2692,7 @@ static int client_info_show(struct seq_file *m, void *v) clp->cl_nii_time.tv_sec, clp->cl_nii_time.tv_nsec); }seq_printf (m,"callback state: %s\n" ,cb_state2str (clp->cl_cb_state)); -seq_printf (m,"callback address: %pISpc\n" , &clp->cl_cb_conn.cb_addr); +seq_printf (m,"callback address: \"%pISpc\"\n" , &clp->cl_cb_conn.cb_addr);seq_printf (m,"admin-revoked states: %d\n" ,atomic_read (&clp->cl_admin_revoked));drop_client (clp);Signature · 1 line
2.39.2
Quoted 15 lines · Mark Grimes
The 'callback address' in
client_info_showis output without quotes causing yaml parsers to fail on processing IPv6 addresses. Adding quotes to 'callback address' also matches that used by the 'address' field.Signed-off-by Mark Grimes <[email protected]>--- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)fs/nfsd/nfs4state.c +0
-0
fs/nfsd/nfs4state.c static int client_info_show(struct seq_file *m, void *v) · line 2698
Quoted 8 lines
fs/nfsd/nfs4state.c +1
-1@@ -2692,7 +2692,7 @@ static int client_info_show(struct seq_file *m, void *v) clp->cl_nii_time.tv_sec, clp->cl_nii_time.tv_nsec); }seq_printf (m,"callback state: %s\n" ,cb_state2str (clp->cl_cb_state)); -seq_printf (m,"callback address: %pISpc\n" , &clp->cl_cb_conn.cb_addr); +seq_printf (m,"callback address: \"%pISpc\"\n" , &clp->cl_cb_conn.cb_addr);seq_printf (m,"admin-revoked states: %d\n" ,atomic_read (&clp->cl_admin_revoked));drop_client (clp);
I agree with Neil's assessment here: