Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

knfsd: demote some printk()s to dprintk()s

Browse source 
To quote a recent mail from Andrew Morton:

	Look: if there's a way in which an unprivileged user can trigger
	a printk we fix it, end of story.

OK.  I assume that goes double for printk()s that might be triggered by
random hosts on the internet.  So, disable some printk()s that look like
they could be triggered by malfunctioning or malicious clients.  For
now, just downgrade them to dprintk()s.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Acked-by:  Neil Brown <neilb@suse.de>
This commit is contained in:
J. Bruce Fields 2007-07-27 16:10:37 -04:00
parent 599e0a2290
commit 2fdada03b3
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/nfsd/nfs4proc.c
View file

@ -238,12 +238,12 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
break; break;
case NFS4_OPEN_CLAIM_DELEGATE_PREV: case NFS4_OPEN_CLAIM_DELEGATE_PREV:
open->op_stateowner->so_confirmed = 1; open->op_stateowner->so_confirmed = 1;
printk("NFSD: unsupported OPEN claim type %d\n", dprintk("NFSD: unsupported OPEN claim type %d\n",
open->op_claim_type); open->op_claim_type);
status = nfserr_notsupp; status = nfserr_notsupp;
goto out; goto out;
default: default:
printk("NFSD: Invalid OPEN claim type %d\n", dprintk("NFSD: Invalid OPEN claim type %d\n",
open->op_claim_type); open->op_claim_type);
status = nfserr_inval; status = nfserr_inval;
goto out; goto out;

20
fs/nfsd/nfs4state.c
View file

@ -509,7 +509,7 @@ check_name(struct xdr_netobj name) {
if (name.len == 0) if (name.len == 0)
return 0; return 0;
if (name.len > NFS4_OPAQUE_LIMIT) { if (name.len > NFS4_OPAQUE_LIMIT) {
printk("NFSD: check_name: name too long(%d)!\n", name.len); dprintk("NFSD: check_name: name too long(%d)!\n", name.len);
return 0; return 0;
} }
return 1; return 1;
@ -1742,7 +1742,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta
if (open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS if (open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS
&& flag == NFS4_OPEN_DELEGATE_NONE && flag == NFS4_OPEN_DELEGATE_NONE
&& open->op_delegate_type != NFS4_OPEN_DELEGATE_NONE) && open->op_delegate_type != NFS4_OPEN_DELEGATE_NONE)
printk("NFSD: WARNING: refusing delegation reclaim\n"); dprintk("NFSD: WARNING: refusing delegation reclaim\n");
open->op_delegate_type = flag; open->op_delegate_type = flag;
} }
@ -2151,7 +2151,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei
*sopp = NULL; *sopp = NULL;
if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) { if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) {
printk("NFSD: preprocess_seqid_op: magic stateid!\n"); dprintk("NFSD: preprocess_seqid_op: magic stateid!\n");
return nfserr_bad_stateid; return nfserr_bad_stateid;
} }
@ -2202,7 +2202,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei
} }
if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) { if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) {
printk("NFSD: preprocess_seqid_op: fh-stateid mismatch!\n"); dprintk("NFSD: preprocess_seqid_op: fh-stateid mismatch!\n");
return nfserr_bad_stateid; return nfserr_bad_stateid;
} }
@ -2218,22 +2218,22 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei
goto check_replay; goto check_replay;
if (sop->so_confirmed && flags & CONFIRM) { if (sop->so_confirmed && flags & CONFIRM) {
printk("NFSD: preprocess_seqid_op: expected" dprintk("NFSD: preprocess_seqid_op: expected"
" unconfirmed stateowner!\n"); " unconfirmed stateowner!\n");
return nfserr_bad_stateid; return nfserr_bad_stateid;
} }
if (!sop->so_confirmed && !(flags & CONFIRM)) { if (!sop->so_confirmed && !(flags & CONFIRM)) {
printk("NFSD: preprocess_seqid_op: stateowner not" dprintk("NFSD: preprocess_seqid_op: stateowner not"
" confirmed yet!\n"); " confirmed yet!\n");
return nfserr_bad_stateid; return nfserr_bad_stateid;
} }
if (stateid->si_generation > stp->st_stateid.si_generation) { if (stateid->si_generation > stp->st_stateid.si_generation) {
printk("NFSD: preprocess_seqid_op: future stateid?!\n"); dprintk("NFSD: preprocess_seqid_op: future stateid?!\n");
return nfserr_bad_stateid; return nfserr_bad_stateid;
} }
if (stateid->si_generation < stp->st_stateid.si_generation) { if (stateid->si_generation < stp->st_stateid.si_generation) {
printk("NFSD: preprocess_seqid_op: old stateid!\n"); dprintk("NFSD: preprocess_seqid_op: old stateid!\n");
return nfserr_old_stateid; return nfserr_old_stateid;
} }
renew_client(sop->so_client); renew_client(sop->so_client);
@ -2245,7 +2245,7 @@ nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *statei
/* indicate replay to calling function */ /* indicate replay to calling function */
return nfserr_replay_me; return nfserr_replay_me;
} }
printk("NFSD: preprocess_seqid_op: bad seqid (expected %d, got %d)\n", dprintk("NFSD: preprocess_seqid_op: bad seqid (expected %d, got %d)\n",
sop->so_seqid, seqid); sop->so_seqid, seqid);
*sopp = NULL; *sopp = NULL;
return nfserr_bad_seqid; return nfserr_bad_seqid;
@ -2858,7 +2858,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
file_lock.fl_type = F_WRLCK; file_lock.fl_type = F_WRLCK;
break; break;
default: default:
printk("NFSD: nfs4_lockt: bad lock type!\n"); dprintk("NFSD: nfs4_lockt: bad lock type!\n");
status = nfserr_inval; status = nfserr_inval;
goto out; goto out;
} }