| Message ID | 1504729681-3504-14-git-send-email-deller@gmx.de |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | None | expand |
On Wed, Sep 06, 2017 at 10:28:00PM +0200, Helge Deller wrote: > The debug and error printk functions in ipvs uses wrongly the %pF instead of > the %pS printk format specifier for printing symbols for the address returned > by _builtin_return_address(0). Fix it for the ia64, ppc64 and parisc64 > architectures. > > Signed-off-by: Helge Deller <deller@gmx.de> > Cc: Wensong Zhang <wensong@linux-vs.org> > Cc: netdev@vger.kernel.org > Cc: lvs-devel@vger.kernel.org > Cc: netfilter-devel@vger.kernel.org Sorry for the delay in processing this. Acked-by: Simon Horman <horms@verge.net.au> Pablo, could you take this through the nf-next tree directly? -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 09, 2017 at 07:52:24AM +0200, Simon Horman wrote: > On Wed, Sep 06, 2017 at 10:28:00PM +0200, Helge Deller wrote: > > The debug and error printk functions in ipvs uses wrongly the %pF instead of > > the %pS printk format specifier for printing symbols for the address returned > > by _builtin_return_address(0). Fix it for the ia64, ppc64 and parisc64 > > architectures. > > > > Signed-off-by: Helge Deller <deller@gmx.de> > > Cc: Wensong Zhang <wensong@linux-vs.org> > > Cc: netdev@vger.kernel.org > > Cc: lvs-devel@vger.kernel.org > > Cc: netfilter-devel@vger.kernel.org > > Sorry for the delay in processing this. > > Acked-by: Simon Horman <horms@verge.net.au> > > Pablo, could you take this through the nf-next tree directly? Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index 3d2ac71a..f73561c 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c @@ -185,7 +185,7 @@ static inline int ip_vs_conn_hash(struct ip_vs_conn *cp) hlist_add_head_rcu(&cp->c_list, &ip_vs_conn_tab[hash]); ret = 1; } else { - pr_err("%s(): request for already hashed, called from %pF\n", + pr_err("%s(): request for already hashed, called from %pS\n", __func__, __builtin_return_address(0)); ret = 0; } diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 1fa3c23..88fc58a 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -300,7 +300,7 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc) unsigned int hash; if (svc->flags & IP_VS_SVC_F_HASHED) { - pr_err("%s(): request for already hashed, called from %pF\n", + pr_err("%s(): request for already hashed, called from %pS\n", __func__, __builtin_return_address(0)); return 0; } @@ -334,7 +334,7 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc) static int ip_vs_svc_unhash(struct ip_vs_service *svc) { if (!(svc->flags & IP_VS_SVC_F_HASHED)) { - pr_err("%s(): request for unhash flagged, called from %pF\n", + pr_err("%s(): request for unhash flagged, called from %pS\n", __func__, __builtin_return_address(0)); return 0; }
The debug and error printk functions in ipvs uses wrongly the %pF instead of the %pS printk format specifier for printing symbols for the address returned by _builtin_return_address(0). Fix it for the ia64, ppc64 and parisc64 architectures. Signed-off-by: Helge Deller <deller@gmx.de> Cc: Wensong Zhang <wensong@linux-vs.org> Cc: netdev@vger.kernel.org Cc: lvs-devel@vger.kernel.org Cc: netfilter-devel@vger.kernel.org --- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)