RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: check command length on osdmon

Browse Source 
Fixes crash on 'ceph osd tell'.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-07-19 10:13:05 -07:00
parent bf8aa18d48
commit 0b366744ae
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mon/OSDMonitor.cc
View File

@ -995,7 +995,12 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
ss << "max_osd = " << osdmap.get_max_osd() << " in epoch " << osdmap.get_epoch();
r = 0;
}
else if (m->cmd[1] == "injectargs" && m->cmd.size() == 4) {
else if (m->cmd[1] == "injectargs") {
if (m->cmd.size() != 4) {
r = -EINVAL;
ss << "usage: osd injectargs <who> <args>";
goto out;
}
if (m->cmd[2] == "*") {
for (int i=0; i<osdmap.get_max_osd(); i++)
if (osdmap.is_up(i))
@ -1014,6 +1019,11 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
}
}
else if (m->cmd[1] == "tell") {
if (m->cmd.size() < 4) {
r = -EINVAL;
ss << "usage: osd tell <who> <what>";
goto out;
}
m->cmd.erase(m->cmd.begin()); //take out first two args; don't need them
m->cmd.erase(m->cmd.begin());
if (m->cmd[0] == "*") {
@ -1039,7 +1049,12 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
} else ss << "specify osd number or *";
}
}
else if ((m->cmd[1] == "scrub" || m->cmd[1] == "repair") && m->cmd.size() > 2) {
else if ((m->cmd[1] == "scrub" || m->cmd[1] == "repair")) {
if (m->cmd.size() <= 2) {
r = -EINVAL;
ss << "usage: osd [scrub|repair] <who>";
goto out;
}
if (m->cmd[2] == "*") {
ss << "osds ";
int c = 0;
@ -1079,6 +1094,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
r = 0;
}
}
out:
if (r != -1) {
string rs;
getline(ss, rs);